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 --combined res/values/strings.xml
index c052c62,6fadca5..1847a53
--- 1/res/values/strings.xml
--- 2/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -2124,7 -2124,19 +2124,19 @@@
      <!-- Hint for the user to use another device to scan QR code on screen to join Wi-Fi [CHAR LIMIT=NONE] -->
      <string name="wifi_dpp_scan_qr_code_with_another_device">Scan this QR code with another device to join \u201c<xliff:g id="ssid" example="OfficeWifi">%1$s</xliff:g>\u201d</string>
      <!-- Hint for QR code detection [CHAR LIMIT=NONE]  -->
-     <string name="wifi_dpp_could_not_detect_valid_qr_code">Couldn\u2019t read QR code</string>
+     <string name="wifi_dpp_could_not_detect_valid_qr_code">Couldn\u2019t read QR code. Re-center code and try again</string>
+     <!-- Hint for Wi-Fi DPP handshake failure [CHAR LIMIT=NONE]  -->
+     <string name="wifi_dpp_failure_authentication_or_configuration">Try again. If the issue continues, contact the device manufacturer</string>
+     <!-- Hint for Wi-Fi DPP handshake failure [CHAR LIMIT=NONE]  -->
+     <string name="wifi_dpp_failure_not_compatible">Something went wrong</string>
+     <!-- Hint for Wi-Fi DPP handshake failure [CHAR LIMIT=NONE]  -->
+     <string name="wifi_dpp_failure_timeout">Make sure the device has been plugged in, charged, and turned on</string>
+     <!-- Hint for Wi-Fi DPP handshake failure [CHAR LIMIT=NONE]  -->
+     <string name="wifi_dpp_failure_generic">Make sure the device has been plugged in, charged, and turned on. If the issue continues, contact the device manufacturer</string>
+     <!-- Hint for Wi-Fi DPP handshake failure [CHAR LIMIT=NONE]  -->
+     <string name="wifi_dpp_failure_not_supported">Adding \u201c<xliff:g id="ssid" example="OfficeWifi">%1$s</xliff:g>\u201d isn\u2019t supported by this device</string>
+     <!-- Hint for Wi-Fi connection fail [CHAR LIMIT=NONE]  -->
+     <string name="wifi_dpp_check_connection_try_again">Check connection and try again</string>
      <!-- Title for the fragment choose network [CHAR LIMIT=50]  -->
      <string name="wifi_dpp_choose_network">Choose network</string>
      <!-- Hint for the user to center another device's QR code in the below camera window [CHAR LIMIT=NONE] -->
@@@ -9176,7 -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] -->