Merge "Use hwservicemanager getTransport." am: 562ed84ff4
am: 9912ec4ca6

Change-Id: I08c33de1eb82b6717b4a9d4d76211dd0fa638d52