Snap for 9014491 from b0bb60cb16e2553d1a478c091c4fcf7b61e9ec17 to tm-qpr1-release

Change-Id: I83f36e58f3120e3bf952cce0979c78d8a9c0f5cb
diff --git a/rootdir/init.rc b/rootdir/init.rc
index cd71aa8..c56f860 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -720,9 +720,13 @@
     # Multi-installed APEXes are selected using persist props.
     # Load persist properties and override properties (if enabled) from /data,
     # before starting apexd.
+    # /data/property should be created before `load_persist_props`
+    mkdir /data/property 0700 root root encryption=Require
     load_persist_props
+
     start logd
     start logd-reinit
+
     # Some existing vendor rc files use 'on load_persist_props_action' to know
     # when persist props are ready. These are difficult to change due to GRF,
     # so continue triggering this action here even though props are already loaded
@@ -842,7 +846,6 @@
     mkdir /data/app-asec 0700 root root encryption=Require
     mkdir /data/app-lib 0771 system system encryption=Require
     mkdir /data/app 0771 system system encryption=Require
-    mkdir /data/property 0700 root root encryption=Require
 
     # create directory for updated font files.
     mkdir /data/fonts/ 0771 root root encryption=Require