Merge "Add more grant tests" into main am: 9bb6b9e607

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

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