Merge "Fix sticky rescue party boot" into main am: 17833ea6

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



Change-Id: I8b93c6a8a9c5c1d425cbcdc47e49779488b3b7f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>