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

Change-Id: I78639f134a0afb444f71c847d75a470a94a4a1f4