Merge "Fix module-file name collisions" am: 92f4e14b am: b88cb3e1 am: 1d4139e7

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



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