Merge "Switch from compos_verify_key to compos_verify" am: cda72c1129 am: 1ffde86801

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

Change-Id: I9931fef83f89c1d8c331bf410801081a26faefa1