Merge "[Provider Model] Simplify filtering WiFi list function" into sc-v2-dev am: 535795b36d am: 19409e2203

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16365458

Change-Id: I03ea77b47655d4f5baba3f510ad478213de62aa2