[automerger skipped] Merge changes from topic "cherrypicker-L64700000955439487:N10200001278963420" into tm-d1-dev am: 5db910a8 -s ours am: 852f38e9 -s ours

am skip reason: Merged-In Ibaac8ec414a53a7c9f31d2f506a851d4fe1f00ab with SHA-1 2eea21f2 is already in history

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



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