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

Change-Id: I7b1cc393cc098752b2df5bfbe3158c51ec23481c