Merge "[Settings] Replace TelephonyManager#from()" am: 98e6ab358b am: 4be4ae6a75 am: c5d575f085

Change-Id: I7dcc409def8e552563df280007363d820d4a28d3