Merge "Merge Vehicle HAL 2.1 iface to 2.0" into oc-mr1-dev