Merge "Add safer Intent extra APIs and deprecate old ones" am: 30e41a64b2 am: 0b0a4d71a2 am: c2fabc1d4a am: 2e5e263d31 am: 58eebe760c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2020758 Change-Id: I2f682aa009aa4ade4237cb2e0ad29917c5b0ce19
This commit is contained in: