Merge "Return the correct action for PromptAndWait" am: 99277fa6af am: c55e7fd95d am: b5d418af52

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1398888

Change-Id: I70131aeb3dd61b165c6671bf26f8e69e5381433d