Merge "Rename merged services.txt module" am: 74b15ca3c5 am: 58ae8524f5

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

Change-Id: I8b3ebfa9e390c979256f048800d038cdfc155753