[automerger skipped] Merge "Change defaults for FREQUENCY_RANGE and NR_STATE"...
[automerger skipped] Merge "Change defaults for FREQUENCY_RANGE and NR_STATE" am: 80d3c539 am: c21c7446 -s ours
am skip reason: skipped by user sarahchin
Change-Id: I536d0e7dbd487206c21b85ca9c609d56f54da8d7