tree 499035934b434f8ad5bd8c20e91541d4333fdc3b
parent 62dba7a4e664fcab04430321720fe67cd22b7591
parent 8ccf79a098537c4445860857980df5eef33d27b0
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578928513 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578928513 +0000

Merge "mainline:Replace serviceState.getDataRegState and getVoiceRegState" am: a5dd35d6c0 am: 8ccf79a098

Change-Id: I70ed56af355b7bd18d31f053fe009727d15b69c8