Merge "Add constants for NR_NSA, NR_NSA_MMWAVE"