Fix CarDiagnosticConstantsTest to workaround an issue in generated HAL code
am: 64fb54b08e

Change-Id: I8aa936037239d80cffcc84b962cfe27f838976ba