tree 8fad0610c3f45207584b4ce2b9cb211b02a8bc4f
parent ae6c84fcb27d11fae98a973c41b1a901361e51a5
parent 058b6f80cd2cbdc8db170f5d3e7cc8a1a77bce9f
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576747475 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576747475 +0000

Merge "[Mainline] decouple ServiceState.getDataNetworkType()" am: 5bdafbf9ce am: 058b6f80cd

Change-Id: Ic371072ece414d481b0bb6e7670f74ef48e200b2