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

Change-Id: I4d5799139e42ea58bb67fe70fd2d2f0c989e6b6a