Merge "[automerger skipped] Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 1f4713bd4f am: 62b8f38312 -s ours" into rvc-d1-dev-plus-aosp am: 8f44b722ff -s ours
am skip reason: Change-Id I90c7a8c47710ea4ad8e8d2682c10440fd7f82270 with SHA-1 e408eb55dc is in history
Change-Id: I053eb039dade1f30148feaec8a10eca52a26424b
This commit is contained in: