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