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

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

Change-Id: Ifbf101ed38d0faf068c2aca4e529f12d3711d5fd