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

Change-Id: I65d3b0a60ad69cb6e5c07297eeb8166230b9f720