Merge "Respect metered filter in matchesMobile*" into sc-v2-dev am: 3a1184edf3

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

Change-Id: If8af6d0b150f3bc4dbbc12f8a96478cf08b23f5d