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

Change-Id: I8da718a83617c4cefb7f3def6034352d9d5faae2