[automerger skipped] Merge "Merge "Add QoS filter matching and unit tests" am:...

[automerger skipped] Merge "Merge "Add QoS filter matching and unit tests" am: 1e8b0527 am: 8625aaea" into rvc-qpr-dev-plus-aosp am: d3f54fcc -s ours am: 9ea02132 -s ours

am skip reason: Change-Id I7d6d66eba5612182703826b60b4d735230572eea with SHA-1 9fef2219 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic25b91b2b862e6ff4cba028ea2ea373c33444fcf