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

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



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