Merge "Define droidcore and droidcore-unbundled in sooong-only builds" into...

Merge "Define droidcore and droidcore-unbundled in sooong-only builds" into main am: 2724c480 am: b62e9876

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



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