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

Merge "core/Makefile: Add experimental desktop update image option" into main am: cd2ab832 am: ede4df1d

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



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