Merge "Remove filegroups for *current.txt files" am: 2a8f6d0027 am: f9a5e2a76e

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

Change-Id: I00c2ecf28771b66d6146b0ecd7dadec654efe3fe