Merge "Allocate UID for fs-verity ownership in keystore"