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