Merge changes from topic "dscp_policies" am: 2a947ceb50

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

Change-Id: Ic21ce0b291e81f1f962f027d8d953e2dbc0d3484