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

Change-Id: Ic51245d0f5aaca92eeb3126e5741f16483613a8b