CDD: Relax requirements for WebView useragent.

Allow the "$(MODEL)" and "Build/$(BUILD)" tokens to be omitted from the
WebView useragent string, to match the current/future behaviour of
Chrome on Android. This is a minor improvement to privacy (reduces
fingerprinting) and security (removes information that may be useful for
targeting exploits).

Bug: 122453525
Change-Id: I8200e619e62a30f84b7c2ebf68f8fa0be47d95b8
(cherry picked from commit 9a8210988ede1f7ca1b76fbf90a3a0c44cf948b3)
diff --git a/3_software/3_4_web-compatibility.md b/3_software/3_4_web-compatibility.md
index a09fb0b..0746841 100644
--- a/3_software/3_4_web-compatibility.md
+++ b/3_software/3_4_web-compatibility.md
@@ -14,16 +14,16 @@
      API.
 *    [C-1-3] The user agent string reported by the WebView MUST be in this format:
 
-    Mozilla/5.0 (Linux; Android $(VERSION); $(MODEL) Build/$(BUILD); wv)
+    Mozilla/5.0 (Linux; Android $(VERSION); \[$(MODEL)\] \[Build/$(BUILD)\]; wv)
     AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 $(CHROMIUM_VER) Mobile
     Safari/537.36
 
     *   The value of the $(VERSION) string MUST be the same as the value for
         android.os.Build.VERSION.RELEASE.
-    *   The value of the $(MODEL) string MUST be the same as the value for
-        android.os.Build.MODEL.
-    *   The value of the $(BUILD) string MUST be the same as the value for
-        android.os.Build.ID.
+    *   The $(MODEL) string MAY be empty, but if it is not empty it MUST have
+        the same value as android.os.Build.MODEL.
+    *   "Build/$(BUILD)" MAY be omitted, but if it is present the $(BUILD)
+        string MUST be the same as the value for android.os.Build.ID.
     *   The value of the $(CHROMIUM_VER) string MUST be the version of Chromium
         in the upstream Android Open Source Project.
     *   Device implementations MAY omit Mobile in the user agent string.