Merge "Add method to match address \ port with QosFilter" am: 8910e2c51b am: ccc311dde9 am: 28f288ea56

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id9951a0be8821192e3fb403787d096c538d691cf