[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L43200000958217546:N96600001329327837" into tm-qpr-dev am: 459e4c32 -s ours

am skip reason: Merged-In Ia4f1260c7ca3e9d0ed12e54f2a582c48f6ecfe6f with SHA-1 57d7a8c9 is already in history

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



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