Merge "Remove filegroups for *current.txt files" am: 2a8f6d0027 am: f9a5e2a76e am: 059abfa49c am: 3611a8d3a1

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

Change-Id: I7aeba7aa3f882a5b274d5e8969119640f98509b3