[automerger skipped] [conflict] Merge changes I9fb87084,Ife34e144 into main...

[automerger skipped] [conflict] Merge changes I9fb87084,Ife34e144 into main am: 2324dace am: c5118559 -s ours am: d4d4c57b -s ours

am skip reason: skipped by user phui

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



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