Merge "Set adminExtras as an empty persistable bundle if left null in...

Merge "Set adminExtras as an empty persistable bundle if left null in builder." into tm-dev am: 95ac43c8 am: 0a6bc03b am: 7688c637 am: 5dfc0b08

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



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