Merge "Also load fs-verity cert from /system/etc/security/fsverity/" into rvc-dev am: 37dedb0f52 am: c4fa28ba60

Change-Id: I65689033a473404fbe3609edd8e9a277a1e21160