[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into sc-dev am: 0f4454ce79 am: 92e29bc9e0 -s ours am: 283de987cb -s ours am: afc27392e6 -s ours am: cd37e1a15e -s ours am: a66bbfe998 -s ours am: 9fcd49f2e4 -s ours am: 3b4a0ff50d -s ours am: ee55e5a34f -s ours am: 6ac8660342 -s ours

am skip reason: subject contains skip directive

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

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