Merge "Fix failing updateSecondaryVersionCounter_whenContactsAreUpdated" into...

Merge "Fix failing updateSecondaryVersionCounter_whenContactsAreUpdated" into tm-qpr-dev am: 9a25a2ae

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



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