[automerger skipped] Merge "Don't remove entries for overriddable modules" am:...

[automerger skipped] Merge "Don't remove entries for overriddable modules" am: c487ae15 am: 9f7ffa1e -s ours am: 1b492935 -s ours

am skip reason: Change-Id I85d0c756f862323bae556bf657d66ec50038985f with SHA-1 ac5e79f9 is in history

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

Change-Id: I08a1d2160f3bec0f965bf72de52903aa6d9e5c72