[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L44800000956518937:N36300001297725767" into tm-qpr-dev am: 037f9470 -s ours

am skip reason: Merged-In I635aa0b879cd04e038d2927fa590c80803d8fb77 with SHA-1 ae23f685 is already in history

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



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