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

Change-Id: I663ef0b7fe47c3268d8d36ecd121cf3b21a7c959