Merge "packages/apps/Contacts: remove deprecated Mockito usages" into main am: dafeddf72e am: ad8597919b

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Contacts/+/3506155

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