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

Change-Id: Icac674d743bfa7d6243b0c23e57f5656bfafaafa