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

Change-Id: I7b2abbeebb247b1690d0692151739d4428f9a7b0