[automerger skipped] Merge changes from topic "cherrypicker-L86900000958037311:N20600001326095833" into tm-qpr-dev am: 53bfe63f am: 793c4329 -s ours

am skip reason: Merged-In Ieee5a2d594319c92d38be0423d8f00a80ce77420 with SHA-1 802904ca is already in history

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



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