Merged from go/wvgerrit/179770 Bug: 276889732 Test: oemcrypto tests Change-Id: I5aec5f03c68847470900dfaf20c6fd324c7f8251