Merge "DO NOT MERGE Add DISTANCE_DISPLAY_UNIT to google VHAL" into qt-qpr1-dev