Merge "Fix NetworkCapabilitiesTest on S" am: 4638c093ed

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

Change-Id: I7e2c6a22a7314584c05bf12083648cad45249bb2