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

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

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