Merge "Move Binder.clearCallingIdentity"