[automerger skipped] Merge "Correct the logic in NetworkCapabilitiesTest" am: efbd8b3961 -s ours am: 64169ae2a1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640144

Change-Id: I553b1c59e6a35c8e8a0ac7dc59d2367bffa1f39d