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

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

Change-Id: Ie2a204eacc363a9dc779569de633cb8b2cbc82b8