[automerger skipped] Merge "Make NetworkCapabilities authoritative for roaming state" am: cad1526c91 am: 1a4bc180d8 am: 1caa00ea6b -s ours
am skip reason: Change-Id Ifdea19fa32089b5c7925f5010169b1dea3d2b304 with SHA-1 6b4bd11b8c is in history
Change-Id: I00a9d3dc6ab9a9b8d635ccd975460dbc8fc4d60d
This commit is contained in: