[automerger skipped] Add 5G NSA to collapsed RAT types list am: d75a22bc am:...

[automerger skipped] Add 5G NSA to collapsed RAT types list am: d75a22bc am: acc9ea42 am: c02e0842 -s ours

am skip reason: Change-Id I0faeda20f0506a48ac1131b234c5fc40d95dfbe0 with SHA-1 cd2ec0ea is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12355984

Change-Id: I7e9ec32d8619cb3527beace1b9c080b75c0fa204