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

[automerger skipped] Merge "RESTRICT AUTOMERGE Fix BAL via notification.publicVersion" into udc-d1-dev am: 07be6824 -s ours am: f1fdae4b -s ours

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

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



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