[automerger skipped] Merge "Add @hide Bundle.getParcelable() with explicit type" am: 58b4c57393 am: 486bd1e357 am: af073f8ad1 -s ours

am skip reason: Merged-In Ieebc044043e0776e71d35c1cc11be9299f972c45 with SHA-1 0206268a12 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1988907

Change-Id: I16645abb573cae6acabb2dad54ed61e14197d52a