[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L56200000957314479:N16200001311084956" into tm-qpr-dev am: 163adecf -s ours

am skip reason: Merged-In I79f098b61e95cc37a86da733483b9f8c87937bda with SHA-1 4ee8597d is already in history

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



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