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

Change-Id: I4bfebf381480c0ec6e0c55ad6a2252bee6916e67