Merge "Support QoS Filter protocol" am: c891d16486 am: b025a0c63c

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

Change-Id: I00e72c9f2b0e12b54dbc5260a579ac900f96758d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>