[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 skip reason: Change-Id I85d0c756f862323bae556bf657d66ec50038985f with SHA-1 ac5e79f9 is in history

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

Change-Id: Ie6568293a747859f0c3fe03704e1c6002c1a6b56