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

Change-Id: Ib34add7735becacc65bc17c8cfd2e008c8a0032a