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

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

Change-Id: I8b9d732884b6c2344e1fccfe786ac2dc5aad6b23