Merge changes from topic "bluetoothmodule" into main am: 169be3476d am: d505445445 am: 178734d7ec am: d08b5b7dbd am: af46b20445

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

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