Merge "Adjust tests for newly-exposed Grant functionality" into main am: daeec820c7 am: a9190ffca8

Original change: https://android-review.googlesource.com/c/platform/system/security/+/3311204

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