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

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



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