Merge "Switch from compos_verify_key to compos_verify" am: cda72c1129

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1988348

Change-Id: If5eb823978a22db4823bb1a9a6760b339e7859ca