Merge "Add Binder.clearCallingIdentity to TracingServiceProxy"