Merge "Customize the default value of Enhanced 4G LTE mode" am: 0f113b2f25 am: df79be072d
am: 92c4fa8570

Change-Id: I0c40a2435feb57c7ebd90491cd0c3055f47b7a07