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

[automerger skipped] move module list creation outside conditionals am: 2319129a am: 68f1d20a am: 409b4be6 -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: Icc4a51f7fdba96d0996438b8e2228f728279d68e