tree 47a40cd7fd60abf9b8644fc560d03a9dfdc64594
parent a48ebd1dbc142fc1557c64339e8412edaee7f135
parent 22d0ed63cc6b545a24fcbe5be89dd4cb85ae1066
author Nathan Harold <nharold@google.com> 1561676775 -0700
committer android-build-merger <android-build-merger@google.com> 1561676775 -0700

Merge "Revert "Use TM SubId in getDataState and getDataActivity"" am: 4d4e2474ea am: f5ee9c61be
am: 22d0ed63cc

Change-Id: Ibb0e9d7f55c8f1ba6179e7afbd63e33c23628822