Merge "Optimize calls to TelephonyManager to check for privileged apps" into nyc-dev
am: 66f0c6f3b8

* commit '66f0c6f3b8bde3ba224a1333a4acbf1b86c959ec':
  Optimize calls to TelephonyManager to check for privileged apps