[automerger skipped] Merge "Also load fs-verity cert from /system/etc/security/fsverity/" into rvc-dev am: 37dedb0f52 -s ours

am skip reason: Change-Id I01085913f81898592a3a1edcaa97aff6dc8ac89c with SHA-1 753ac2a34b is in history

Change-Id: I03f73bf85dd8b435f6e302ab78cc5aab1de9ff47