Merge "Forward `svc data` to "cmd phone data" in TelephonyShellCommand" am: 888365c03d am: df81a7e5e7

Change-Id: Ia5cec6dca1bd1ad83d032bad5cbb5e875f7bec49