Merge "Fix module-file name collisions" am: 92f4e14b94

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2202594

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