Merge changes from topic "bt-broadcast-aidl" am: b8e8c57ac6

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

Change-Id: I111a9e3aaac832f357a786d66f76bd154a1e6c94