Merge "core/Makefile: Add experimental desktop recovery image option" into main am: c3db07bded

Original change: https://android-review.googlesource.com/c/platform/build/+/3288225

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