[automerger skipped] Merge "Add constants for NR_NSA, NR_NSA_MMWAVE" am: 109876b90c am: 2be994b854 -s ours am: d172a92135 -s ours
am skip reason: Change-Id I0faed300c3a2640ef6675ed7497575fe4f364b2c with SHA-1 152161ad00 is in history
Change-Id: I6221b4812d84e6dca5ad5afa83e936e502cc7b86
This commit is contained in: