[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L66900000959043608:N68200001345915916" into tm-qpr-dev am: 8136b6b1 am: ab8626ce -s ours

am skip reason: Merged-In I197d670c929c7a086340f9d8ff72b0ec170616fe with SHA-1 698f4dce is already in history

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



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