DO NOT MERGE - Backport of ag/748165 to klp-dev

Security patch level in Settings

b/23946860

Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d

core/java/android/os/Build.java

@@ -89,6 +89,21 @@ public static class VERSION {
          */
         public static final String RELEASE = getString("ro.build.version.release");
 
+        /**
+         * The base OS build the product is based on.
+         * For Pre-API 23 - use support libs to access.
+         * @hide
+         */
+        public static final String BASE_OS = SystemProperties.get("ro.build.version.base_os", "");
+
+        /**
+         * The user-visible security patch level.
+         * For Pre-API 23 - use support libs to access.
+         * @hide
+         */
+        public static final String SECURITY_PATCH = SystemProperties.get(
+                "ro.build.version.security_patch", "");
+
         /**
          * The user-visible SDK version of the framework in its raw String
          * representation; use {@link #SDK_INT} instead.