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: 410f9d3e am: 75daa009

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



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