Merge "Make getCallingUidOrThrow() not throw in clearCallingIdentity() blocks"