[automerger skipped] Use filter from CollectionUtils. am: 5e8f8431d8 am: b0b3e93682 -s ours am: 047ed657f1 -s ours
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727815
Change-Id: Ibae3db073f86d3a1eb07ed6b0dbc6c69bfc23b97
This commit is contained in: