Merge "Rename generic_system_image to aosp_shared_system_image" into main am: 6725f0757c am: d965160146

Original change: https://android-review.googlesource.com/c/platform/development/+/3355839

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