Merge "Don't crash the system server when a misconfigured agent adds a DSCP policy" into main am: 51ac9ff7c4 am: e905281986

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3527438

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