25489dfa5b
(This is a merge of http://go/wvgerrit/107263.) The CryptoSessionMetricsTest suite assumed that GetOEMPublicCertificate would only be called once, but in practice, it may be called twice, since the first call can return OEMCrypto_ERROR_SHORT_BUFFER. This patch updates the tests to accept 1 or 2 calls. This patch also updates a few EXPECTs on vector lengths that should have been ASSERTs, to avoid problems when later accessing the vector. Bug: 169111969 Test: jenkins/ce_cdm_tests Test: build_and_run_all_unit_tests.sh Change-Id: I9432dd2694c7181ab57ed55f66ff6c8be0c867f9