Merge changes from topic "bluetoothmodule" into main am: 169be347 am:...

Merge changes from topic "bluetoothmodule" into main am: 169be347 am: d5054454 am: 178734d7 am: d08b5b7d

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



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