Merge "Support QoS Filter protocol" am: c891d16486

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

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