Merge "Add QoS filter matching and unit tests" am: 1e8b0527 am: 8625aaea

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d25d91a30ba9d0b38f2c77ea175a765b6a14eee