Merge "Create a new Bundle object if mExtras is null." into tm-qpr-dev am:...

Merge "Create a new Bundle object if mExtras is null." into tm-qpr-dev am: 5abc2692 am: 836d445e

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



Change-Id: I08230811c13ad7fe0afc43d4ca67c95cc152fdaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>