Merge "Define toolbox.recovery" into main am: e74001be6f am: c59d10d92e

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

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