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

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

Change-Id: Ib3df7b938ec24b07e9fc6649ab13c3035b1f5cba
tree: c6fdfc458b49609355fd4cc0eff47b25b14d202e
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/