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

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

Change-Id: I52d135904ffc8cb4aae0166deb7bfaedc969a583