[automerger skipped] Merge changes I6d4a14ce,I233fe305 into tm-dev am: a1f9c1b1 -s ours am: 482fe4bc -s ours

am skip reason: Merged-In I6d4a14ce90d4d1db06d78cf6ab8de4bc08275c58 with SHA-1 430d97ff is already in history

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



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