Merge changes from topic 'highlight_fixed' into oc-dev

import android.annotation.DrawableRes;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.TestApi;

import android.content.ContentResolver;

import android.content.Context;

import android.content.res.ColorStateList;

        super.encodeProperties(stream);

        stream.addProperty("layout:baseline", getBaseline());

    }

    /** @hide */

    @Override

    @TestApi

    public boolean isDefaultFocusHighlightNeeded(Drawable background, Drawable foreground) {

        final boolean lackFocusState = mDrawable == null || !mDrawable.isStateful()

                || !mDrawable.hasFocusStateSpecified();

        return super.isDefaultFocusHighlightNeeded(background, foreground) && lackFocusState;

    }

}