Merge "Replace deprecated AndroidJUnit4." into main am: 0eb13cf6db am: 125e2410e4

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

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