[ Merge of go/wvgerrit/c/cdm/+/170370 ] Bug: 277620071 Test: WidevineHalTest Change-Id: I05385358875723e20b13d3abb21a0deee9f35c29
[ Merge of go/wvgerrit/c/cdm/+/170370 ] Bug: 277620071 Test: WidevineHalTest Change-Id: I05385358875723e20b13d3abb21a0deee9f35c29