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

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

Change-Id: I9da55adce678ef51eab82a5bdb3e36678b9e1fe5