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

Change-Id: I772dc8a69476a61fb9eb63f7950f0fc0dc1d2c3f