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

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



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