[automerger skipped] Merge changes from topic...

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

am skip reason: Merged-In Iaee9282469b3f9e0fb5497413bda007dbc2e738a with SHA-1 9a2f66f5 is already in history

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



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