Merge "Use TM SubId in getDataState and getDataActivity"
am: 28a7b5974d

Change-Id: Ic207e1c86fd7f776e54417d90fc90c353d23b502