[automerger skipped] Merge "DO NOT MERGE Add DISTANCE_DISPLAY_UNIT to google VHAL" into qt-qpr1-dev am: 2b7fefdc97 -s ours
am: 7fd3adfbf4 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia38eafb5dc9113077ba1eb79a5b146692395753a