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

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

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