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

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

Change-Id: Ic3cd457dbb7b64840a5e9deee417440e5c44c51e