Merge "Add modules for Soong-built GSI" into main am: 92f337f785

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3333474

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