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

Change-Id: Ia314dea6724273100d27d9b703c6144563612b97