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

Merge "[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" into sc-v2-dev-plus-aosp am: 1e8ceb44 -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: I87e2430372a099474ea4b2e94949d454952f65e7