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