[automerger skipped] Merge "DO NOT MERGE Add DISTANCE_DISPLAY_UNIT to google VHAL" into qt-qpr1-dev-plus-aosp
am: 5ff78c1399 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib5267daa33169d25a529c5c6a4b6439dc5f5a0c9