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

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

Change-Id: I8d7901d4fc7c9af00c00185dc50115de811f125a