Merge changes from topic "bluetoothmodule" into main am: 4bfa2e1e6d

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

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