Merge "Fix module-file name collisions" am: cdaa8466 am: eb143ce8 am:...

Merge "Fix module-file name collisions" am: cdaa8466 am: eb143ce8 am: d951dc17 am: a71665d0 am: 0422abef

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



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