Merge changes from topic "dscp_policies" am: 2a947ceb50 am: aa8facf3ac

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

Change-Id: Icf9a3aa63533e606d477ad6712983a28322ecd77