[automerger skipped] Add missing modules to the internal system image am: 364469d1 -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: I8466d555a564298ac20eefd31f0321883ff2c37b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>