Merge "Remove a redundant Binder.clearCallingIdentity()"