[automerger skipped] Merge "Separate out lists of modules from build rules" am: 6b35a8ac47 am: b2b97f6f5e am: 58d62a691d -s ours

am skip reason: skip tag Change-Id Ibef1fb686305b5b1b50811b7d1c6d677d07d7177 with SHA-1 33b9b855f3 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671345

Change-Id: I108580583ae17d6d06437763050566a738107711