[automerger skipped] RESTRICT AUTOMERGE Fix BAL via notification.publicVersion am: daed0a712a -s ours am: ac97d37049 -s ours

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

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

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