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

Change-Id: I12d1a6725f4eb800f0245c6692f5f448059012dc