Merge "dscpPolicy - further improvements" am: d4e6d1c971 am: 2ef6447ac0 am: ef9908aa01

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

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