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

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

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