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

Change-Id: I53d362ec143403f8c3f71f1d9d84dda891156ac9