[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: d56bfed6 -s ours am: 7ceb626f -s ours

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

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

Change-Id: I1141d77763628757df84ec7a5287c79059f9f1da