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

Change-Id: I806437c5034cb8a83e92e0b6e2477619c480e891