[automerger skipped] Merge "Remove per-file CompOS signature support" am: 15dbaecf25 am: fa78f2c3c0 am: 3fff93b0cb -s ours

am skip reason: Merged-In I549705fec917de763bad1e935c3cad885ab002d5 with SHA-1 59f655dae2 is already in history

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

Change-Id: I5de7f1568da34536433d08159b1f9d6ba9f1032c