Merge "Fixing SUW Test case. Its failing because Smart Setup screen is...

Merge "Fixing SUW Test case. Its failing because Smart Setup screen is disabled and few text changes Bug:78176721 Test: adb shell am instrument -w -r   -e debug false -e class android.test.functional.auto.apps.SUWHelperTest#testBasicSUW android.test.functional.auto.apps/android.support.test.runner.AndroidJUnitRunner" into pi-dev am: c0d6deca
am: 6ac46aac

Change-Id: I93478a60ace1f7ad04ab4fd6479eb5d3f7f15561