Merge "Fix module-file name collisions" am: cdaa8466e0

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

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