Merge "Fix BAL via notification.publicVersion" into udc-qpr-dev am: c993926b45

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

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