[automerger skipped] Merge "Support QoS Filter protocol" am: c891d164 am:...

[automerger skipped] Merge "Support QoS Filter protocol" am: c891d164 am: b025a0c6 am: 29bc873c -s ours

am skip reason: Merged-In I2b5813eef1ae19bea757fb781032dd0bac68fb56 with SHA-1 61c5c2e3 is already in history

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



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