Merge "CEC: Enable log for non-user builds" into lmp-mr1-dev

package com.android.server.hdmi;

import android.annotation.Nullable;

import android.os.Build;

import android.os.SystemClock;

import android.util.Pair;

import android.util.Slog;

    // Logging duration for same error message.

    private static final long ERROR_LOG_DURATTION_MILLIS = 20 * 1000;  // 20s

    private static final boolean DEBUG = false;

    private static final boolean IS_USER_BUILD = "user".equals(Build.TYPE);

    private static final ThreadLocal<HdmiLogger> sLogger = new ThreadLocal<>();

    }

    private void debugInternal(String logMessage) {

        if (!DEBUG) {

        if (IS_USER_BUILD) {

            return;

        }

        Slog.d(TAG, logMessage);