Merge "Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am:...

Merge "Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f81359 am: 1e410610" into tm-d1-dev-plus-aosp am: 934a2302 am: d4a87480

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18591472



Change-Id: I297da52f23876cb9d215eabe6b7c8115961abe7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>