[automerger skipped] Merge "Fix failing tests" into tm-qpr-dev am: 2ae5f488 -s ours

am skip reason: Merged-In I8d7cc2883cec80702e3d7446d9490be723b50cfd with SHA-1 0cd24626 is already in history

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



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