Merge "[automerger skipped] Merge "Add more tests in...

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 am: 1f45191e -s ours

am skip reason: Change-Id I90c7a8c47710ea4ad8e8d2682c10440fd7f82270 with SHA-1 cb86457d is in history

Change-Id: I053eb039dade1f30148feaec8a10eca52a26424b