Merge "Clear caller identity while checking Tether Change permission" am: fdc619e544 am: 6724df4905
am: c78d3e2c6c

Change-Id: Id9e1fc35b76ed82eb24558cfe994145dd5af72b2