b77a30bf3d
[ Merge of http://go/wvgerrit/143370 ] [ Cherry-pick off http://ag/16624952 ] Devices without a keybox may not have access to a device ID if the OEM uses the device ID from the keybox as its source of truth. For devices which have lost their keybox, OEMCrypto_GetDeviceID() was assumed to return ERROR_KEYBOX_INVALID if that was the case; however, Qualcomm's implementation was returning ERROR_NO_DEVICEID. Given that both error codes are appropriate, the CDM has been updated to accept both as an indication that the device ID cannot be retrieved, and that the null device ID should be returned. Bug: 190504842 Bug: 214113125 Test: Manual test Change-Id: I8fb8a1bddfe895062b707b51fcadffd983adb40e