[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 SHA1 af984d0d4e is in history

Change-Id: Id9aad9e5fabd499d81fcffac646ad91791eef7af