Merge "Mirror fs-verity ownership UID to Java" am: d6b817cd51

am: 9b83a708c7

Change-Id: I7b2abbeebb247b1690d0692151739d4428f9a7b0

core/java/android/os/Process.java

@@ -182,6 +182,12 @@ public class Process {
      */
     public static final int NETWORK_STACK_UID = 1073;
 
+    /**
+     * Defines the UID/GID for fs-verity certificate ownership in keystore.
+     * @hide
+     */
+    public static final int FSVERITY_CERT_UID = 1075;
+
     /** {@hide} */
     public static final int NOBODY_UID = 9999;