am 52579125: Merge "Persist the line 1 number and simplified network settings page." into lmp-dev
am 52579125: Merge "Persist the line 1 number and simplified network settings page." into lmp-dev

* commit '52579125e2e3b837e92e6f09b0b1e08e897a5aa7':
  Persist the line 1 number and simplified network settings page.

md5555/android_packages_services_Telephony