[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L56900000957135174:N84400001307540511" into tm-qpr-dev am: 796e2150 -s ours

am skip reason: Merged-In If5e336e64141bbea9edd82459c84c5d4d4bd5ce0 with SHA-1 8656bf9a is already in history

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



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