[automerger skipped] Merge changes I2cdaa240,Ie2fb572a into tm-dev am: 08b0f534 am: b4606142 -s ours

am skip reason: Merged-In I2cdaa240bb40b2241a7ee8ec1f5651fe0cc734f6 with SHA-1 7c06f1c7 is already in history

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



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