Merge "dscpPolicy - further improvements" am: d4e6d1c971

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

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