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

Change-Id: Ie1d6e9faf962d17b673724d5ef0790dd2d86ac73