[automerger skipped] Merge "test: Make mMockitoRule public for AppWithAdminGrantedPermissionsCounterTest" into main am: 4dca839abd
am: fcdd8bb6d9
-s ours
am skip reason: Merged-In Id2ecf785655dfcca9f65fc3ee64ffae11fc78e88 with SHA-1 62c2800b3f
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3448908
Change-Id: I80372a4be56b56337b806b96370312c2b33f725d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: