Merge "Add DISTANCE_DISPLAY_UNIT to google VHAL"