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: 0e759fa6 am: ea94471c

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



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