Merge "Add a carrier option to hide the option of "Enhanced 4G LTE Mode"" into oc-dev