Fix merge conflict in the security string for OC-M8-release
(cherry picked from commit 5502a6440a3953890094384d9559be0de1f0809a)

Change-Id: I2014aa7c37a9d1347bb289f4ef23173f0be62959
diff --git a/core/ b/core/
index f26191c..b52bdc9 100644
--- a/core/
+++ b/core/
@@ -181,7 +181,7 @@
     #  It must be of the form "YYYY-MM-DD" on production devices.
     #  It must match one of the Android Security Patch Level strings of the Public Security Bulletins.
     #  If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
-     PLATFORM_SECURITY_PATCH := 2019-02-01
+    PLATFORM_SECURITY_PATCH := 2019-02-05