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

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

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