Merge "[Settings] Adopt TelephonyBasePreferenceController" into rvc-dev am: fb015a3c24
am: 551f515e6d
am: d5c09fbced
am: fa1927aaf0
Change-Id: I61cb349945fa3122651dfa21e56c1f5c72665e8e
This commit is contained in: