Merge "Allow system and root to access fsverity keys"
am: aad4f6ed19

Change-Id: Iaf8053877a995044e65eed2e128706bdbe6e4df7