Merge "Merge "Add Speed_Display_Units property in DefaultHal" into qt-dev am: 130fad824b am: 4acdd6621d" into qt-r1-dev-plus-aosp
am: 9ed2b815f3

Change-Id: I65aa1f446487e13ecc49e4d91589bf12bd82fe8f