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

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

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