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