Merge "Rename the enums that are supposed to match OBD2 values to have an Obd2 prefix Rename the enums that contain a list of sensors and don't directly map to OBD2 to have a Diagnostic prefix" into oc-mr1-dev
am: a732c00feb

Change-Id: I3ad79a59cc2425bdf8dae2c654123605fb24bc3f