Merge "Mirror fs-verity ownership UID to Java" am: d6b817cd51 am: 9b83a708c7
am: 1863e70b22

Change-Id: I8d5669350ff2d000957e2c603f6b9ab255bbdade