[automerger skipped] Merge changes I0917ce3f,Ia9c879a8,I3cd2a839,I703b5e1e...

[automerger skipped] Merge changes I0917ce3f,Ia9c879a8,I3cd2a839,I703b5e1e into tm-qpr-dev am: 1e815788 -s ours am: 8b18d14f -s ours

am skip reason: Merged-In I0917ce3fd72792ca9b2c49aabd9131c100c1667c with SHA-1 c7911d8f is already in history

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



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