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

[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into tm-dev am: 487726ad am: 53692d21 -s ours am: 475e4a24 -s ours am: 9841afed -s ours

am skip reason: subject contains skip directive

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



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