[automerger skipped] Merge changes Ia0b94726,I83468115,I8226c327,I0a439d16...

[automerger skipped] Merge changes Ia0b94726,I83468115,I8226c327,I0a439d16 into tm-dev am: 4120077e -s ours

am skip reason: skipped by user aliceypkuo

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



Change-Id: Ic843ab794215f14f37b954cbcad5aa283559b060
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>