[automerger skipped] Merge "Fixed consistent issue for subId in dataConnection"
am: 421e974a -s ours
am skip reason: change_id Ie25ee7a7e7227de3c57a297cd0e8367c85bcccba with SHA1 cbc64458 is in history
Change-Id: Id8a2f2e8b6acccf689bac9a0db5a2509f682810e