Merge "Merge "Force update wifi QS when opening." into oc-dr1-dev am: 0e9d9420e3 am: 23a490e273" into oc-mr1-dev-plus-aosp