DO NOT MERGE Fix BAL via notification.publicVersion am: 1896c2e706 am: 95f88ce4c9

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

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