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

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

Change-Id: I2be3208da5e0b7887debfdc1d3062e82050b551f