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

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

Change-Id: I86a2c82568018023c427b2b8a505b636527db170