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
The google suw flow has changed a little bit and added some new flow
choices in Pie, so our scripts need to be updated to match it. This
fixes the restore choice screen being shown twice.
Also reorganized the order of the wizard action results to move the
resultcode from the beginning to the end. This is a noop change that's
just to bring it inline with google's suw scripts.
Change-Id: Ia3ac9d1fdae62132c377e8ac2f767a795790d092
