Merge "Introduce additional prebuilt_* module types" into main am: 237ffc78 am: c068d538

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



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