[automerger skipped] Merge "QoS filtering based on Protocol ID" am: b2b672ca...

[automerger skipped] Merge "QoS filtering based on Protocol ID" am: b2b672ca am: 3b0c1624 am: 690d25e2 -s ours

am skip reason: Merged-In I11f1ac0c13ba6924a88ec1f5bda165caec1f5d8c with SHA-1 722d6f85 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2356182



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