[automerger skipped] Merge "Add configuration for network capabilities that...

[automerger skipped] Merge "Add configuration for network capabilities that would be forced marked as cellular transport" into 24D1-dev am: ee908655 -s ours

am skip reason: Merged-In Iffd705d7f380713ea340c1048a87cbee5f9dcf43 with SHA-1 0fe76a09 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26639852



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