Merge "android_system_image only packages "system" items" am: 0cfe1f43 am: 578ea8d0

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



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