Merge "Optimize calls to TelephonyManager to check for privileged apps" into nyc-dev