[automerger skipped] Merge "Remove system-*.txt files" am: c9dbe6ed am: cf67a70f am: 34cbddb1 am: 6e9e62bd -s ours

am skip reason: Change-Id I8d5f0a132aa307d88fbc2bd7521cdd4bdd8c6cee with SHA-1 d5cba345 is in history

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

Change-Id: I34b096ea9db512cec90cf9f1e78016601d7e5d69