Merge "Extend light-greylist of some TelephonyManager APIs until Q."