[automerger skipped] Merge "Add missing modules to the internal system image"...

[automerger skipped] Merge "Add missing modules to the internal system image" into aosp-main-future am: 4fed08c2 -s ours

am skip reason: Merged-In I7beb3ad6be7f5aa5d55c72de4e809cfbbf32f61b with SHA-1 8add4997 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/29690953



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