Merge "android_system_image only packages "system" items" am: 0cfe1f43 am:...

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

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



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