Merge "Add android.os.Build.VERSION_CODES.T" into sc-dev-plus-aosp am: 3e1311a4b4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15286710

Change-Id: Ie92f05f3b752f18f9bf17a2d80e755292635128b

core/api/current.txt

@@ -30820,6 +30820,7 @@ package android.os {
     field public static final int Q = 29; // 0x1d
     field public static final int R = 30; // 0x1e
     field public static final int S = 31; // 0x1f
+    field public static final int T = 10000; // 0x2710
   }
 
   public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

core/java/android/os/Build.java

@@ -1130,6 +1130,11 @@ public class Build {
          * S.
          */
         public static final int S = 31;
+
+        /**
+         * T.
+         */
+        public static final int T = CUR_DEVELOPMENT;
     }
 
     /** The type of build, like "user" or "eng". */