[automerger skipped] Merge changes I37f46b53,I742ba3f1,Ife2aa3ae into tm-dev am: 1fb28ba1 am: 8ed11b62 -s ours

am skip reason: Merged-In I37f46b538694dea159e1835b6fd16dd41a3a31d5 with SHA-1 4891931f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/18729293



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