[automerger skipped] Merge "RESTRICT AUTOMERGE Fix BAL via...

[automerger skipped] Merge "RESTRICT AUTOMERGE Fix BAL via notification.publicVersion" into udc-dev-plus-aosp am: 434635a8 -s ours am: 8e4a3767 -s ours am: 674789f1 -s ours

am skip reason: Merged-In I8f25d7a5e47890a0496af023149717e1df482f98 with SHA-1 6283942d is already in history

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



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