[automerger skipped] Remove the old CompOS key management am: 318d7ba4fc -s ours am: d1653ed88a -s ours am: 5dff70bc2f -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: Ic394b10cc51f5e258336ff7f6401af48e8d53277