[automerger skipped] Merge changes...

[automerger skipped] Merge changes I72e0b382,I674beac1,Ia01fa4c0,Ibcc44694,I5602c516, ... into tm-dev am: 674fa323 am: ed089e1d -s ours am: c6b56419 -s ours

am skip reason: Merged-In I72e0b3822a934cc22c975ffbd487af957e49fdb8 with SHA-1 9f7e0664 is already in history

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



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