[automerger skipped] Merge "Respect metered filter in matchesMobile*" am:...

[automerger skipped] Merge "Respect metered filter in matchesMobile*" am: 0d9d449b am: 4e571a2b am: 952bb0de am: 89d64149 -s ours

am skip reason: Merged-In I66dd51b020f6d895cd002acc05bef6b6315cd447 with SHA-1 bedf2272 is already in history

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

Change-Id: Ie6a726132476dda4733e66358bffca59f76cd3c1