Merge "Define reboot.recovery and watchdogd.recovery" into main am: 625bf70162

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

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