Merge "Support cross-UID access from AndroidKeyStore."