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

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

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



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