[automerger skipped] Merge "Don't remove entries for overriddable modules" am: c487ae15ba
am: 9f7ffa1e6a
-s ours
am skip reason: Change-Id I85d0c756f862323bae556bf657d66ec50038985f with SHA-1 ac5e79f900
is in history
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1343378
Change-Id: I340914517c65c1b3dde8da26fa84387b6bf00046
This commit is contained in: