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