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

Change-Id: I74f75379ca4c50767fe9f8b78992e5e5e6f93a93