Merge "logwrap_fork_execvp block recovery auto reboot" am: 85d86d0e

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2089483



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