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

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