[automerger skipped] Merge "Allow data auto attach during voice call." am:...
[automerger skipped] Merge "Allow data auto attach during voice call." am: e74f6e81 am: 47a085d9
am: 84d77efa -s ours
am skip reason: change_id Ie5a810f013cfb75ed1ecc9edce2794abd73f1540 with SHA1 3ee1afea is in history
Change-Id: Iece96964eca025f1125433a85dba0cfacc619f05