Merge "Keystore 2.0: Fix loading access tuple from the grant table." am: 7708000c11 am: 84b7a8fdc3

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

Change-Id: Ifed2a30cd68da6455cd42ed820deaa3bae6d1441