Merge "Fixed speed selection lost when changing password in Wi-Fi hotspot...

Merge "Fixed speed selection lost when changing password in Wi-Fi hotspot settings" into udc-dev am: 32602794

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



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