Merge changes from topic "hci_aidl_hal" am: 88150368f8

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

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