Merge "[automerger skipped] Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 4406aac0 am: 6e431968 -s ours" into rvc-d1-dev-plus-aosp