Merge changes from topic "ble-broadcast-api-feedback" am: c9e3ca8e am:...

Merge changes from topic "ble-broadcast-api-feedback" am: c9e3ca8e am: d1b42a96 am: dec912de am: c1287d05

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2019629

Change-Id: Id07e87332998d69aa3abe18ca221492de74886e3