Fix module-file name collisions am: 7b6acb3f2d am: d95892caec

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2203961

Change-Id: I860ef90af83dd6d32626d968311978704815e6b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>