suw: Update wizard scripts for R

The google suw flow has changed a little bit in Android 11, so
this change syncs our scripts to google's so that they match.

Change-Id: I59e9643fad8c48c22a090a29e621e2761ef7e0d0
2 files changed