[automerger skipped] Merge changes from topic "fix-cts-2" into tm-dev am: d0bd88ef -s ours

am skip reason: Merged-In I10c1fc206b7bdf7bf97e80bf1bc579e936021f37 with SHA-1 81ed5b53 is already in history

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



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