Merge "Remove unnecessary Binder.clearCallingIdentity()"