[automerger skipped] Merge "Restore "Add Data command in Telephony"" am: fc05847402 am: e0c859f6f5 am: 1e831e983f -s ours
am skip reason: Change-Id Iaa2fe6cef045edd01b968c119347846a00b2e7b6 with SHA-1 f5125128aa is in history

Change-Id: I26f67df3554f2606ebf7a3b0c5dcd40e6ad85d08