Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev