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

Change-Id: Iaeae098f1185b045483334ff100e47a9be608c64