[automerger skipped] Merge "[Provider Model] Don't dismiss quick settings when...

[automerger skipped] Merge "[Provider Model] Don't dismiss quick settings when config Wi-Fi network" into sc-qpr1-dev am: 24ccad0b am: 2fa510c7 -s ours

am skip reason: Merged-In I4aafcbc093d779243a9b7da425a805c32300302c with SHA-1 e1188fff is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15746808

Change-Id: I0b4853e1f2cf29bd5b6073533d16b26d7557c6a2