[automerger skipped] NEW Use Mockito 4.6.1 API am: b0fd3ee5b0 -s ours
am skip reason: Merged-In I0e301b641312f8cc4a235df5ec62acf1446cbb64 with SHA-1 d010065e40 is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20918023
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20947434
Change-Id: If7af1ef0c59e837b9f18f8c5de468b98a3a51a32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: