diff --git a/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java b/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java
index 2d379d95ad7..18563b587f5 100644
--- a/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java
+++ b/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java
@@ -19,7 +19,6 @@ package com.android.settings.enterprise;
 import android.annotation.NonNull;
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
-import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.support.annotation.Nullable;
 
@@ -70,9 +69,7 @@ public class DevicePolicyManagerWrapperImpl implements DevicePolicyManagerWrappe
 
     @Override
     public boolean isSecurityLoggingEnabled(@Nullable ComponentName admin) {
-        // TODO(b/36584321): Switch to DevicePolicyManager#isSecurityLoggingEnabled once that is
-        // callable by the system.
-        return SystemProperties.getBoolean("persist.logd.security", false);
+        return mDpm.isSecurityLoggingEnabled(admin);
     }
 
     @Override