Merge "[MS78.1] Fix NetworkIdentity#Builder crashing on 5G NSA networks" am: e73b1c2270 am: c51c0c971f

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

Change-Id: I75dd58672f7597d30f8ef22dc9668d6f9f27d05f