Merge "Grant adb auth under recovery for unlocked & userdebug devices"

    // descriptor will always be open.

    adbd_cloexec_auth_socket();

#if defined(ALLOW_ADBD_NO_AUTH)

#if defined(__ANDROID_RECOVERY__)

    if (is_device_unlocked() || __android_log_is_debuggable()) {

        auth_required = false;

    }

#elif defined(ALLOW_ADBD_NO_AUTH)

    // If ro.adb.secure is unset, default to no authentication required.

    auth_required = android::base::GetBoolProperty("ro.adb.secure", false);

#elif defined(__ANDROID__)