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

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



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