Merge "Expose VHAL propertyId for CarPropertyManager" into pi-dev