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

Change-Id: Ie6839576f61563f2a82fec53afc42208f5a37f3c
tree: 5c742558aa44586e4830385e2f7f1feb72f86abf
  1. core/
  2. services/
  3. tests/