Merge "Add method to match address \ port with QosFilter" am: 591fe5327c am: c6e47cad53

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I31b6fc16a31c45a9f44dc90872fd1b1fc03fcc14