[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: 5fe86dcd8b -s ours am: 1f1f58b01f -s ours am: 6fd0646e1a -s ours

am skip reason: subject contains skip directive

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

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