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

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

Change-Id: I1c4a8fd1b34d4a078c33cc3e3a24190b4048e9fe