Merge "dscpPolicy: prevent cache overflow" into main am: 6b387a2219

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

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