Merge changes from topic "bluetoothmodule" into main am: 4bfa2e1e am: 155c3162

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



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