Merge "Clear callingId before binder calls in CompatChanges"