Merge "Add safer Bundle APIs and deprecated old ones" am: c5589d2c92

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

Change-Id: Iadab8b0106bf99b9c6fbdeca6cc020e1d909ae1a