[automerger skipped] Merge "Make NetworkCapabilities authoritative for roaming state" am: 5c76e6a4ba am: 8db226275a am: c485179d93 -s ours
am skip reason: Change-Id Ifdea19fa32089b5c7925f5010169b1dea3d2b304 with SHA-1 466b665a3e is in history

Change-Id: I00a9d3dc6ab9a9b8d635ccd975460dbc8fc4d60d