[automerger skipped] Merge "Fix BAL via notification.publicVersion" into...

[automerger skipped] Merge "Fix BAL via notification.publicVersion" into udc-dev am: af132383 -s ours am: 1ad78f8d -s ours am: 4a746093 -s ours am: e6c93994 -s ours

am skip reason: Merged-In I8f25d7a5e47890a0496af023149717e1df482f98 with SHA-1 8d839e49 is already in history

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



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