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

Change-Id: I3acaf90104e009981849ef9107cafd6924ed5e9f