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

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

Change-Id: Ie5f2ea044e8975c6864bb7cb4e55fd1e2cf43c2b