Merge "[Settings] Refactor Telephony PreferenceController" am: 1b00c00f79
am: 6865bece3c
am: 66913f8aea
Change-Id: I7c99ae47c4980d919e671ea927a17fb3053352f1
This commit is contained in: