Merge "Fix NetworkCapabilitiesTest on S" am: 4638c093ed am: 31969c1dc5 am: dbb110de2d am: 3598bd16b6 am: eae2769799

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

Change-Id: I3627ef7720e0b8ad492c0bb3df5a625f41e08886