[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: ee60bf10 -s ours
am skip reason: change_id Ie5a810f013cfb75ed1ecc9edce2794abd73f1540 with SHA1 3ee1afea is in history
Change-Id: Id7c729d5a04e38ffea9d308ac184a5032ca95a27