Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f81359 am: 1e410610

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



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