[automerger skipped] Merge "Fix failing...

[automerger skipped] Merge "Fix failing updateSecondaryVersionCounter_whenContactsAreUpdated" into tm-qpr-dev am: 9a25a2ae -s ours am: a987c9ab -s ours

am skip reason: Merged-In I6c521ae6cce411aab7c8cd941645cd9a216b8d9c with SHA-1 64792a4a is already in history

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



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