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

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

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