Merge "Use CharSequence instead of String in CursorAnchorInfo"