Merge "Add constants foor NR_NSA, NR_NSA_MMWAVE" into rvc-dev