Revert "DO NOT MERGE: Revert "Add VanillaIceCream to android.os.Build""

This reverts commit f9143c6a35.

Reason for revert: reland

Change-Id: I48f7ed8349ab0a240874a4bce3c522758a163c3a

core/api/current.txt

@@ -32653,6 +32653,7 @@ package android.os {
     field public static final int S_V2 = 32; // 0x20
     field public static final int TIRAMISU = 33; // 0x21
     field public static final int UPSIDE_DOWN_CAKE = 34; // 0x22
+    field public static final int VANILLA_ICE_CREAM = 10000; // 0x2710
   }
 
   public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

core/java/android/os/Build.java

@@ -1223,6 +1223,11 @@ public class Build {
          * Upside Down Cake.
          */
         public static final int UPSIDE_DOWN_CAKE = 34;
+
+        /**
+         * Vanilla Ice Cream.
+         */
+        public static final int VANILLA_ICE_CREAM = CUR_DEVELOPMENT;
     }
 
     /** The type of build, like "user" or "eng". */