[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L78100000957439934:N08000001313698819" into tm-qpr-dev am: 252e65ed -s ours

am skip reason: Merged-In I186b40a0e9c0c3f5bbfa24f36c9cf5d24e504bbd with SHA-1 2bb4ecbe is already in history

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



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