Merge \"Stop relying on BuildCompat to tell whether N+ devices.\" into nyc-mr1-dev

import android.database.Cursor;

import android.net.Uri;

import android.os.Build;

import android.os.Build.VERSION;

import android.provider.ContactsContract.CommonDataKinds.Im;

import android.support.annotation.IntDef;

import android.support.v4.os.BuildCompat;

import android.provider.ContactsContract.DisplayPhoto;

import android.telephony.PhoneNumberUtils;

import android.text.TextUtils;

    private static int sThumbnailSize = -1;

    public static final boolean FLAG_N_FEATURE = BuildCompat.isAtLeastN();

    public static final boolean FLAG_N_FEATURE = Build.VERSION.SDK_INT >= 24;

    // TODO find a proper place for the canonical version of these

    public interface ProviderNames {

     * false} otherwise.

     */

    public static boolean isNCompatible() {

        return BuildCompat.isAtLeastN();

        return VERSION.SDK_INT >= 24;

    }

    /**