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

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

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



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