[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L35800000956702617:N08700001300682969" into tm-qpr-dev am: 6a945df0 -s ours am: 5a10f6f8 -s ours

am skip reason: Merged-In Ib331e75661e294f2b3c66e3de220a2fb5d49fcf9 with SHA-1 f5c4ca54 is already in history

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



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