Merge "Make getUnderlineColor public."

api/current.txt

@@ -45849,6 +45849,7 @@ package android.text.style {
     method public deprecated java.lang.String getLocale();
     method public java.util.Locale getLocaleObject();
     method public int getSpanTypeId();
+    method public int getUnderlineColor();
     method public java.lang.String[] getSuggestions();
     method public void setFlags(int);
     method public void updateDrawState(android.text.TextPaint);

core/java/android/text/style/SuggestionSpan.java

@@ -369,10 +369,7 @@ public class SuggestionSpan extends CharacterStyle implements ParcelableSpan {
 
     /**
      * @return The color of the underline for that span, or 0 if there is no underline
-     *
-     * @hide
      */
-    @UnsupportedAppUsage
     public int getUnderlineColor() {
         // The order here should match what is used in updateDrawState
         final boolean misspelled = (mFlags & FLAG_MISSPELLED) != 0;