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

Change-Id: I92dd5fd0d4771d99fd0932cfa2e709ac6e9ec8cb