[automerger skipped] Add a SubId to getDataState and getDataActivity am: cbce726a14 -s ours
am: 1bd7203fa6 -s ours
am skip reason: change_id I5fe30bd1f3819f256883b48adccbe6d42ed03ec9 with SHA1 c4689b143d is in history

Change-Id: I19d6abfaa27599750c10f7cccc0e3387ffa3c8a3