tree 3b407f8cd46aa618736369d465ad2e5a53e6cb6c
parent 68a76f5c4c2c269fc3130ee1d7b8222840a8cd9d
parent 72f579d5f26239202ab297e354873192856ed45d
author SongFerng Wang <songferngwang@google.com> 1576272474 -0800
committer android-build-merger <android-build-merger@google.com> 1576272474 -0800

Merge "ServiceState merges voice and data into a single value"
am: 72f579d5f2

Change-Id: I371f56959c9d1204022c37b67c8f821ed737297d