Merge "Emit a system image target for the current product" into main am:...

Merge "Emit a system image target for the current product" into main am: 71aa5357 am: 7c10bc2e am: 8f93602a am: 10fd5a6d am: c5d316c1

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



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