Merge "keystore: rename uid to callingUid"