[automerger skipped] Merge "Fixed incorrect handling of re-creating network...

[automerger skipped] Merge "Fixed incorrect handling of re-creating network agent" am: 7c7fdda3 am: d523996e am: bd712464 -s ours

am skip reason: Merged-In Ib938c050deafa834b2cd6e30de3e9560f2d72536 with SHA-1 5a4f25d1 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2035084

Change-Id: I0792210dfcffbdf2ba9e6336cea8e1847505c558