Merge "Adjust Class<T> parameter bounds in new Bundle APIs" am: 15b7548d05 am: 7f6ac3e820 am: ffdd4aa037

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

Change-Id: I09586ba0388f89f0da4ee95a0445424e6a68fa8e