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: 38c90458

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



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