[automerger skipped] Fix BAL via notification.publicVersion am: e79cbff7f8 -s ours am: b94f3bf077 -s ours

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

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

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