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

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

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