Merge "Decouple Ipv6UpstreamRule with Ipv6DownstreamRule" into main am: 2a6a7359b7 am: 9f7f268e5d am: c0262413a8

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

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