Merge "Use DevicePolicyManager#isSecurityLoggingEnabled"

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;

    @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