Merge "Force update wifi QS when opening." into oc-dr1-dev
am: 0e9d9420e3

Change-Id: Ic6539fa0efc794ac9787e116b6d962c6b5149635