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

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

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