Merge "Change defaults for FREQUENCY_RANGE and NR_STATE"
am: 9146586e64

Change-Id: I8c7ecdd2ef6c1001537d1f06b39daa7713dfcfee