Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f
am: a3b983560b
am: 90b0b7d10f
am: 76051d2c6d
Change-Id: I454d1ad715d6a9f24b12e8ae3cdd02bf408eca45
This commit is contained in: