Merge "Fix unexpected Wi-Fi hotspot shutdown" into tm-dev am: 3ed73b7b

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



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