Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev