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

Change-Id: I32f7abf337c69d94331b79244650f176a5fdf468