Merge "Add a carrier option to hide the option of "Enhanced 4G LTE Mode"" am: 23393da165 am: b2558c4ec1
am: 93d5948e51

Change-Id: I3028d999e93475bf729a357af40a78e8c94a1d51