Merge "Stop reading fs-verity certificate from keystore" am: 21b6c38fa0 am: d26b301d8b

Change-Id: Ieddef0ad1caaea59acc22f3d8b2566fffd031daf