Merge "Fix error overwriting when restoring error"

core/java/android/widget/TextView.java

@@ -3809,8 +3809,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
             // Display the error later, after the first layout pass
             post(new Runnable() {
                 public void run() {
+                    if (mEditor == null || !mEditor.mErrorWasChanged) {
                         setError(error);
                     }
+                }
             });
         }
     }