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

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

Change-Id: I47775ef5ed41e8d62e58364ec8a536e39161c295