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

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

Change-Id: I8b8a07f433aa34cd29de401f3137c6992812dc20