[automerger skipped] Merge "Make RedactedNetworkCapabilities compatible with upcoming change" into android14-tests-dev am: f0082bb767 -s ours

am skip reason: Merged-In I45d39f5bc3b1c4af26cc990ce29b45e9ad7d3c3c with SHA-1 fd9d0e8855 is already in history

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

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