Merge "Post-O. Move OBD2 support to Vehicle HAL 2.1."