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

[automerger skipped] Don't remove entries for overriddable modules am: 81aa8a42 am: 0350a2e6 -s ours am: b65f3805 -s ours am: 90135c61 -s ours

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

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

Change-Id: I59d7ad36eebc34224aa458f36f30770e4864c00c