Merge "Stop loading fs-verity certificate from keystore" into rvc-dev am: 3a9bb2ba50

Change-Id: I5278437f08c0003cc1e15ab53eabe7ed181f431a