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

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

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