[automerger skipped] Merge "Add constants for NR_NSA, NR_NSA_MMWAVE" am:...
[automerger skipped] Merge "Add constants for NR_NSA, NR_NSA_MMWAVE" am: 109876b9 am: 2be994b8 -s ours
am skip reason: Change-Id I0faed300c3a2640ef6675ed7497575fe4f364b2c with SHA-1 152161ad is in history
Change-Id: I0b7ddb74e60d22910d2643a754b00fce05a566f1