[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d60 am: 4e16b6b4a7 -s ours am: 46f540cb09 -s ours am: d533736905 -s ours am: 30354234a3 -s ours am: 18bace2910 -s ours am: 0713b8ce43 -s ours am: d80debe691 -s ours am: 30aabba4d2 -s ours

am skip reason: subject contains skip directive

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

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