Merge "Clear callingId before binder calls in CompatChanges" am: 45d1f67bf6

Change-Id: I803ed8ac7035295d819130d1b19c9585fe0edb65