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

[automerger skipped] Merge "RESTRICT AUTOMERGE Fix BAL via notification.publicVersion" into udc-d1-dev-plus-aosp am: 864a0b87 -s ours

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

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



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