Merge "Merge "Opt in to allow BAL" into udc-dev am: 2043d64d am: b05728d1"...

Merge "Merge "Opt in to allow BAL" into udc-dev am: 2043d64d am: b05728d1" into udc-d1-dev-plus-aosp am: 1afc216e

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



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