Merge changes Ib2ff7e44,I950d614d,Ic87c2f8e into stage-aosp-master

* changes:
  Merge "Move Binder.clearCallingIdentity" am: bd46b1c4a2
  Merge "Move Binder.clearCallingIdentity"
  Move Binder.clearCallingIdentity