Merge "Telephony(MSIM): Fix Cellular Data Preference" into nyc-dev