Merge "Remove system-*.txt files" am: c9dbe6ed8b am: cf67a70f68 am: 34cbddb139

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

Change-Id: I7efb4d5ab08c46f748287a134bbccd074776fcfe