resolve merge conflicts of bc0e1136 to nyc-dev-plus-aosp

Change-Id: I35015c89b3b036816665deccc5e20cd2e90ca208

property_contexts

@@ -34,6 +34,7 @@ debug.db.               u:object_r:debuggerd_prop:s0
 dumpstate.              u:object_r:dumpstate_prop:s0
 log.                    u:object_r:log_prop:s0
 log.tag.WifiHAL         u:object_r:wifi_log_prop:s0
+security.perf_harden    u:object_r:shell_prop:s0
 service.adb.root        u:object_r:shell_prop:s0
 service.adb.tcp.port    u:object_r:shell_prop:s0