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

Change-Id: I23589524b2321307a983890f6f28e635ce6952d2