Merge "Allocate UID for fs-verity ownership in keystore" am: cda0a308eb
am: d692386f36

Change-Id: I8f2a5efb6c2c2a431ed2bdb66cc84126ef14644d