Merge changes If4e8e87c,Ie8e48422,Iab4974f9

* changes:
  Exposing TelephonyManager.isIccLockEnabled as a system API.
  Un-expose LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH for R.
  Un-expose ACTION_SERVICE_PROVIDERS_UPDATED.