Merge "Use ' for apostrophe in HTML encoding"

core/java/android/text/TextUtils.java

@@ -1325,7 +1325,11 @@ public class TextUtils {
                 sb.append("&"); //$NON-NLS-1$
                 break;
             case '\'':
-                sb.append("'"); //$NON-NLS-1$
+                //http://www.w3.org/TR/xhtml1
+                // The named character reference ' (the apostrophe, U+0027) was introduced in
+                // XML 1.0 but does not appear in HTML. Authors should therefore use ' instead
+                // of ' to work as expected in HTML 4 user agents.
+                sb.append("'"); //$NON-NLS-1$
                 break;
             case '"':
                 sb.append("""); //$NON-NLS-1$