Merge "Minor clean-up in NetworkCapabilities"
am: 98dc002acc

Change-Id: Ic70f545a4886461f38f1af934600f4e1afe0179f
tree: eeb264ed31519def5a041c90e2d1f28d97d951dd
  1. core/
  2. services/
  3. tests/