Merge "Fix NetworkCapabilitiesTest on S" am: 4638c093ed am: 31969c1dc5

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

Change-Id: I222873f6629bc81e2944e11c25e43518e6b33682