Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into tm-dev am: 487726ad98 am: 04c1ae14cf

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

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