[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L87300000957709922:N70400001319582846" into tm-qpr-dev am: 70e2a974 -s ours

am skip reason: Merged-In Id735883e87e92f520ccc4de41b9f8359534ef2f9 with SHA-1 21d3e2ea is already in history

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



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