Merge "Add genrules for merged current.txt" am: 591327acd4

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

Change-Id: I19fd4adb80344dd3c500cf326c3cda67db9ba106