Merge "Merge "[Settings] Adopt TelephonyBasePreferenceController" into rvc-dev am: fb015a3c24 am: 551f515e6d" into rvc-d1-dev-plus-aosp am: 01f6620449 am: 6535980f84 am: 6dc769ae3c
Change-Id: I045b97b103745909c0df73843ab87b931bfc9c5f
This commit is contained in: