Merge "packages/apps/Messaging: remove deprecated Mockito usages" into main am: cf93bb5c3d am: de315b7623

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

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