[automerger skipped] Merge "Add respective modules to the list of individually...

[automerger skipped] Merge "Add respective modules to the list of individually toggleable modules." into main am: 497f02d8 am: 5022516a -s ours

am skip reason: Merged-In Ica19b306bdbd67a86d2cf73478d0f886f782118c with SHA-1 e14f4862 is already in history

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



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