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

Merge changes from topic "le-audio-broadcast" into tm-dev am: bed3aea4 am: 1277c1c4 am: 7cac0779

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



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