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

[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into sc-dev am: 0f4454ce am: 92e29bc9 -s ours am: 283de987 -s ours am: afc27392 -s ours am: cd37e1a1 -s ours

am skip reason: subject contains skip directive

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



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