Merge "Mirror fs-verity ownership UID to Java"
am: d6b817cd51

Change-Id: I996e62ddb8b8c24d9af52cf870e670986a0aa0a6