[automerger skipped] Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 37fbb256e8 -s ours am: fed9c0d848 -s ours
am skip reason: Change-Id I90c7a8c47710ea4ad8e8d2682c10440fd7f82270 with SHA-1 3df2ebcb83 is in history
Change-Id: I3367950e4212e7539bce1f25b68830d7ffc04bab
This commit is contained in: