Merge "Use hwservicemanager getTransport." am: 562ed84ff4 am: 9912ec4ca6
am: ea377a967f  -s ours

Change-Id: Idb0e7c9d95ade65922241316fe1c75b5cee56d98