[automerger skipped] Merge "DO NOT MERGE Fix BAL via...

[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d am: 4e16b6b4 -s ours am: 46f540cb -s ours am: d5337369 -s ours

am skip reason: subject contains skip directive

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



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