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

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



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