Merge changes from topic "bluetoothmodule" into main am: 169be3476d am: d505445445

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

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