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