[automerger skipped] Merge changes If5003302,I46b03d02,I02e35e94,Ie36c68fd into tm-qpr-dev am: 1d49637e -s ours am: a8009c5c -s ours

am skip reason: Merged-In If50033021448f38c76cf10b758131a8661624457 with SHA-1 41a2e4b5 is already in history

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



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