[automerger skipped] Merge "Make NetworkCapabilities authoritative for roaming state" am: b32eec22b2 am: 5c6a0c74ff am: 61a8c1bb44 -s ours
am skip reason: Change-Id Ifdea19fa32089b5c7925f5010169b1dea3d2b304 with SHA-1 a8cc3cb4c5 is in history
Change-Id: I00a9d3dc6ab9a9b8d635ccd975460dbc8fc4d60d
This commit is contained in: