[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 8d839e4985 am: 93100d607d -s ours am: 66264b5b3b -s ours am: fd3fd4d265 -s ours am: 2662b93e28 -s ours am: fe0fc51319 -s ours am: 5d106db106 -s ours am: 70cdbc6248 -s ours am: cb96891a07 -s ours am: a21450c035 -s ours

am skip reason: subject contains skip directive

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

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