Merge "Make NetworkCapabilities authoritative for roaming state" am: b32eec22b2 am: 5c6a0c74ff

Change-Id: I1f14e1613d78af8664e7c0f59f5c348455403ec8
tree: 30686bf0ea676cd92ac0f41011e0c0c4187c8e80
  1. core/
  2. services/
  3. tests/