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

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

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