Merge "Add @hide Bundle.getParcelable() with explicit type" am: 58b4c57393 am: 486bd1e357

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

Change-Id: I49ededbfb0e5b52a50997247debef5c04b9edf5c