[automerger skipped] move module list creation outside conditionals am:...

[automerger skipped] move module list creation outside conditionals am: 2319129a am: 68f1d20a -s ours am: 1b4526d0 -s ours

am skip reason: Change-Id I199788d49072d4c59737b3ef2c75546852cf3e36 with SHA-1 1013d789 is in history

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

Change-Id: I531f524c6475cdc069591d4c94717d69c4279fe5