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

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

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