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

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



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