Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f
am: 2df7ee7f0e
am: 59da6a7c05
am: cd54f01f7d
Change-Id: I2f57cdce8e079aab3a93685f01f647f6f357eb3d
This commit is contained in: