Merge "Expose PortLocationType in car-lib" into pi-dev
am: f6c62c1d01

Change-Id: I7aa3529d267d543945c0b0dbf2da30332ce26ee4