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