[automerger skipped] Merge "Use TM SubId in getDataState and getDataActivity" into qt-r1-dev am: 7dad5ea750 -s ours
am:3953c473a1-s ours am skip reason: change_id I035f2c44a7955e88608b1c336acb72fb68c3e450 with SHA1af984d0d4eis in history Change-Id: If9bd299eddf63de1fddc657739566a8a9ded5e96
This commit is contained in: