Snap for 11151687 from 9459237 to udc-d2-release

Change-Id: Icad4c2b63bd729efb9ff3e4db596fafb53e2352d

Author: Android Build Coastguard Worker

apps/CtsVerifier/res/values/strings.xml

@@ -4455,16 +4455,17 @@ You should be prompted to select credentials; choose the ones you just installed
     <string name="test_accessibility_service_label">Test accessibility service</string>
     <string name="policy_transparency_test_instructions">
         1. <xliff:g id="set_step" example="Set policy by turning the switch on">%1$s</xliff:g>\n
-        2. Open Settings app by clicking the \"Open settings\" button below. Note that this will open the personal Settings app. If this device has the work settings in a different app or screen, then navigate there, ignoring the button if necessary.\n
-        3. Verify that clicking on \"Allow multiple users\" toggle will trigger a support dialog.\n
+        2. Open Settings app by clicking the "Open settings" button below. Note that this will open the personal Settings app. If this device has the work settings in a different app or screen, then navigate there, ignoring the button if necessary.\n
+        3. Verify that performing the following action will trigger a support dialog:\n
+           <xliff:g id="user_action" example="Adding an account">%2$s</xliff:g>.<xliff:g id="exception_node" example="NOTE: if the device doesn't support the action...">%3$s</xliff:g>\n
         4. Verify that the support dialog displays the short support message set earlier.\n
     </string>
     <string name="optional_policy_transparency_test_note">\n\t<b>NOTE</b>: if the device doesn\'t support this action please skip this test and mark it as passing.</string>
     <string name="user_restriction_set_step">
         Set \'%s\' user restriction by turning on the switch below.
     </string>
     <string name="disallow_add_user">Disallow add user</string>
-    <string name="disallow_add_user_action">Accessing the multiple users settings page, or if the device allows access to the page, then attempting to add a new user </string>
+    <string name="disallow_add_user_action">Accessing the multiple users settings page, or if the device allows access to the page, then attempting to enable the feature </string>
     <string name="disallow_adjust_volume">Disallow adjust volume</string>
     <string name="disallow_adjust_volume_action">Adjusting the volume\n
         NOTE: If the device does not support volume adjustment in Settings app please skip this test and mark it as passing.\n</string>

apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/PolicyTransparencyTestActivity.java

@@ -172,7 +172,8 @@ private void updateTestInstructions() {
         }
         ((TextView) findViewById(R.id.widget_label)).setText(widgetLabel);
         ((TextView) findViewById(R.id.test_instructions)).setText(
-                getString(R.string.policy_transparency_test_instructions, setStep));
+                getString(R.string.policy_transparency_test_instructions,
+                        setStep, userAction, note));
         updateWidget(widgetId);
     }