Merge "core/Makefile: Add desktop recovery image target hook" into main am: f4a9dab3

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



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