[automerger skipped] Merge "Avoid tear down when re-creating the network...

[automerger skipped] Merge "Avoid tear down when re-creating the network agent" am: db563504 am: 1bb543b1 am: 7c1ce910 -s ours

am skip reason: Merged-In I7b715e75e85cfc38320fa0d4aff6c51dd286f802 with SHA-1 f00ce1b1 is already in history

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

Change-Id: Ie44e676be694e5fef90a1cc0521120877115a32d