[automerger skipped] Merge changes from topics...

[automerger skipped] Merge changes from topics "cherrypicker-L60000000957790553:N63900001320988662", "cherrypicker-L78900000957813236:N55000001321779106" into tm-qpr-dev am: d5466138 -s ours am: e25f69f6 -s ours

am skip reason: Merged-In I11abddcb7cf11f1837de1eb7cf60851a70b8f92a with SHA-1 e30bb4cb is already in history

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



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