tree 034312ba83208232033a958afcdb4228d735c717
parent 41e14bee2e411286d41aaa6e51d479c18a58ef05
parent dfc48164f3a6dbadddc786f3d199fd10b5d57fd5
author Treehugger Robot <treehugger-gerrit@google.com> 1643195111 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1643195111 +0000

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

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

Change-Id: I75dd58672f7597d30f8ef22dc9668d6f9f27d05f