Unspecialize oc-dev-plus-aosp

oc-dev-plus-aosp will become aosp master, which needs to continue to
be able to build features targeted at PPR1.

This reverts commit 096aaeee162a4bba904937705b0eb59ef5c2493b.

Bug: 36891159
Test: builds
Change-Id: I7060a5742609e96102027eea528e0e2db8e7b129
Merged-In: I546d1c25a2b1d948a0e7da796f59e734a98635da
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 656d57e..0a9f483 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -40,7 +40,7 @@
 
 DEFAULT_PLATFORM_VERSION := OPR1
 MIN_PLATFORM_VERSION := OPR1
-MAX_PLATFORM_VERSION := OPR1
+MAX_PLATFORM_VERSION := PPR1
 
 ALLOWED_VERSIONS := $(call allowed-platform-versions,\
   $(MIN_PLATFORM_VERSION),\
@@ -80,10 +80,12 @@
 # please add that PLATFORM_VERSION to the following text file:
 # cts/tests/tests/os/assets/platform_versions.txt
 PLATFORM_VERSION.OPR1 := 8.0.0
+PLATFORM_VERSION.PPR1 := P
 
 # This is the current development code-name, if the build is not a final
 # release build.  If this is a final release build, it is simply "REL".
-PLATFORM_VERSION_CODENAME.OPR1 := REL
+PLATFORM_VERSION_CODENAME.OPR1 := O
+PLATFORM_VERSION_CODENAME.PPR1 := P
 
 ifndef PLATFORM_VERSION
   PLATFORM_VERSION := $(PLATFORM_VERSION.$(TARGET_PLATFORM_VERSION))