Merge changes from topic "le-audio-broadcast" into tm-dev am: bed3aea4

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



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