Merge "Rename generic_system_image to aosp_shared_system_image" into main am:...

Merge "Rename generic_system_image to aosp_shared_system_image" into main am: 4e543271 am: 428da329

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



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