Merge "Correct the logic in NetworkCapabilitiesTest" am: 457f91decf

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

Change-Id: I32bc9ee2db0b192513f782455a91d7336875a039