Merge changes from topic "Wi-Fi DPP error code handling"

* changes:
  Fix camera stop forever after error occurs while sharing or adding network
  Handle different error codes in DPP
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6fadca5..1847a53 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -9188,7 +9188,7 @@
     <!-- Title of condition that do not disturb is on [CHAR LIMIT=36] -->
     <string name="condition_zen_title">Do Not Disturb is on</string>
 
-    <!-- Summary of condition that do not disturb is on and all exceptions set to off [CHAR LIMIT=36] -->
+    <!-- Summary of condition that do not disturb is on and all exceptions set to off [CHAR LIMIT=38] -->
     <string name="condition_zen_summary_phone_muted">Phone muted</string>
 
     <!-- Summary of condition that do not disturb is on and some exceptions are allowed [CHAR LIMIT=36] -->