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

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

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