Fix a simple logic mistake.

If the icon is precomposed or the icon IS null, set the touch icon url. This
ensures there will be a touch icon set if either precomposed or regular is
specified. Precomposed icons take precedence.

Bug: 2546984
Change-Id: Id9291006ecda8659b823ab9629eb98a6f8d45f5e

core/java/android/webkit/CallbackProxy.java

@@ -1164,7 +1164,7 @@ class CallbackProxy extends Handler {
         // for null.
         WebHistoryItem i = mBackForwardList.getCurrentItem();
         if (i != null) {
-            if (precomposed || i.getTouchIconUrl() != null) {
+            if (precomposed || i.getTouchIconUrl() == null) {
                 i.setTouchIconUrl(url);
             }
         }