[automerger skipped] Merge "Add a SubId to getDataState and getDataActivity" into qt-r1-dev am: 3671c8067d -s ours
am: 8c4b349f46 -s ours
am skip reason: change_id I5fe30bd1f3819f256883b48adccbe6d42ed03ec9 with SHA1 c4689b143d is in history

Change-Id: I7c169e0baf9f52f93401bf9d007b0474de728381