Merge "Add respective modules to the list of individually toggleable modules."...

Merge "Add respective modules to the list of individually toggleable modules." into main am: 497f02d8

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



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