Merge "core/Makefile: Add experimental desktop recovery image option" into...

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

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



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