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

[automerger skipped] move module list creation outside conditionals am: 2319129a -s ours am: 765c0faa -s ours

am skip reason: Change-Id I199788d49072d4c59737b3ef2c75546852cf3e36 with SHA-1 2319129a is in history

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

Change-Id: I934e3bb98187023e218d5863742193dc46aa0036