Merge "Make restoreCallingIdentity() @CriticalNative."