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

Change-Id: Ie2daa594c252d71e63125108036a4428563bed5b