Merge "Use ArgumentMatchers to replace deprecated org.mockito.Matchers" into main am: 729b91d11c am: c25739091a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2984754

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