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