Merge "KeyMint + KeyMaster: Include permissions for FEATURE_HARDWARE_KEYSTORE."