Merge "Add more tests in NetworkCapabilitiesTest.java" am: bc806f782e

Change-Id: Ie50a0e4e332dd16c7300efb488f4ac4f25c3b6c9