Merge changes from topic "dscp-tap" am: 80d263d762

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

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