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

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



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