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

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

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