Merge "Move Binder.clearCallingIdentity"
am: bd46b1c4a2

Change-Id: Ib2ff7e445c5e3850b14007cad4c9194f00098672