Merge "make/core/Makefile: Skip images for local builds by default." into main am: f38c15ab

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



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