[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: 04c1ae14 am: 5f48e533 -s ours am: 47a9332f -s ours

am skip reason: subject contains skip directive

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



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