Merge "Upgrade TelephonyProvider DB for ApnSetting fields"