Merge "Refine carrier Wi-Fi functions" into tm-dev am: 750376ec am:...

Merge "Refine carrier Wi-Fi functions" into tm-dev am: 750376ec am: 67649864 am: 42b9b5dc am: 25a3f417

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



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