Merge "Add more tests in NetworkCapabilitiesTest.java" am: 60ee9b5a9f am: d9a6a6b8b6

Change-Id: Ibc00ea23f55360ad464ef439d88480354cbf04ae
tree: 5835a0bb50dfd4327159c31734c19adc5b4d11e0
  1. core/
  2. services/
  3. tests/