[automerger skipped] Merge "Forward `svc data` to "cmd phone data" in TelephonyShellCommand" am: 888365c03d am: df81a7e5e7 am: 20d11fbca2 -s ours
am skip reason: Change-Id I687635ff78439dd446df538312c4811ef8073ea3 with SHA-1 0de373a192 is in history

Change-Id: If4a24914d12d1ca3e4cfb660dbd9c3d83647114b