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

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

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