Merge "Rename merged services.txt module" am: 74b15ca3c5 am: 58ae8524f5 am: 590544a108 am: 2e4629a729

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

Change-Id: I3b2278fbd6ab363ff9d017a8d20381acec53b5b0