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

Change-Id: I27a3b169895c37138cea027c5b5543037baa6b65