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

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



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