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

Change-Id: I85043174796af8d37a390786e37993bd224a644a