[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L29400000958400038:N91300001333276333" into tm-qpr-dev am: d0385106 -s ours

am skip reason: Merged-In Iaee9282469b3f9e0fb5497413bda007dbc2e738a with SHA-1 621a15f2 is already in history

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



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