[automerger skipped] Merge changes from topic "cherrypicking-party" into tm-qpr-dev am: e0be500c -s ours am: aa06609b -s ours

am skip reason: Merged-In Ia675c3b3b0613b2b00a588a803473a3d997bf0ee with SHA-1 c1a2deb6 is already in history

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



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