tree 30686bf0ea676cd92ac0f41011e0c0c4187c8e80
parent 2cd8d1fcb3a69474f6211b4ad0c09b6399d2a2c4
parent 5c6a0c74ff53a7cdee0c6156eae0d982e5059ddc
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579667051 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579667051 +0000

Merge "Make NetworkCapabilities authoritative for roaming state" am: b32eec22b2 am: 5c6a0c74ff

Change-Id: I1f14e1613d78af8664e7c0f59f5c348455403ec8