Merge "Fix Wi-Fi hotspot switch UI issue" into tm-dev am: 727583b75f

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

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