[automerger skipped] Merge "Remove the old CompOS key management" am: 071549e707 -s ours am: aeba7421d3 -s ours am: 5ef5c443b1 -s ours

am skip reason: Merged-In Ia649165630048a3b625e6c7aa84e8b5d18d2a8da with SHA-1 4827dd5eef is already in history

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

Change-Id: I5c576c86af1911fa5dc866223579c6232c04f5cb