Merge "Set adminExtras as an empty persistable bundle if left null in builder." into tm-dev am: 95ac43c8bd am: 0a6bc03b73 am: 7688c637c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18799650 Change-Id: I61a7e99dcb085b97f887aca2d82160f31d0cf274 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: