Merge "Add IPv6 Handling for DSCP Policies and Support Interfaces with MAC Addresses" am: ba18a9ee43 am: f9e35c52b0

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

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