[automerger skipped] Merge "DO NOT MERGE Add DISTANCE_DISPLAY_UNIT to google VHAL" into qt-qpr1-dev
am: 2b7fefdc97 -s ours
am skip reason: change_id I6a4d571975d5fe7ba6419cd4c37b734f21162f41 with SHA1 88213e3193 is in history

Change-Id: I90fbc05ff30819397f24ce64b11432943f6f214f