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

Change-Id: Ibde16b20b84000954d479213025b078cfd7d26b1