Merge "[Provider Model] Simplify filtering WiFi list function" into sc-v2-dev