[automerger skipped] Remove the old CompOS key management am: 318d7ba4fc -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: I5d1246c8eb61651dc5384248fd51e655bd157210