[automerger skipped] Merge "Change how override_modules work with prebuilts."...

[automerger skipped] Merge "Change how override_modules work with prebuilts." am: caec264b am: 499a0ad8 -s ours am: 71bda880 -s ours

am skip reason: Change-Id I96d24f1440ff8a8aa8b1253fc22fd532b5588339 with SHA-1 433ea232 is in history

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

Change-Id: I99d1af735950a821c04879ea2d053d3f6abb4089