Merge "Fix conflicting JavaDoc of TYPE_TEXT_FLAG_NO_SUGGESTIONS" into oc-mr1-dev
am: 7bbe06231f

Change-Id: Ica5ba4969d1961acd7c037cae285d29c69da1407