Merge "Define toolbox.recovery" into main am: e74001be

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



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