Merge "Enable fsverity signature checking" am: aaee497db2
am: 0d8d105e32

Change-Id: I01ddf98d6d66f6e9c2490b919059c67432f33878