Merge "Use carrierconfig instead of overlay to get USE_HFA_FOR_PROVISIONING and USE_OTASP_FOR_PROVISIONING." into mnc-dev