Merge "Set adminExtras as an empty persistable bundle if left null in builder." into tm-dev am: 95ac43c8 am: 1ef250b4 am: 0c9c0b80 am: dd90759c

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



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