Merge "Make TextView.getTextDirectionHeuristic public"