[automerger skipped] Merge "Change defaults for FREQUENCY_RANGE and NR_STATE" am: 9146586e64 am: 04a332ce6f -s ours
am skip reason: Change-Id I4509f22cdae656de3ad011de3a1664e27d35986a with SHA-1 aefc64b0f2 is in history

Change-Id: Ib4b205d4ca38b2e84f6cb611bf45b40fbe9d5d6c