Merge changes from topic "bt-broadcast-aidl" am: b8e8c57ac6 am: b5c7afe32c am: d3acb83474 am: 30a3ed75ce

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1977699

Change-Id: Id51ae7963b65c58d1e36743c38bfc4b90d1fee16