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
am: 5517e5dbad

Change-Id: I487243e4b13ba5cf913f0808db702d01819491c6