Merge changes from topic "fix-cts-2" into tm-dev am: d0bd88ef am: d9fe7d87

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



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