Merge "Make NetworkCapabilities authoritative for roaming state" am: 5c76e6a4ba am: 8db226275a

Change-Id: I1f14e1613d78af8664e7c0f59f5c348455403ec8