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

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

Change-Id: I952efb47b3fb874c38bb805429311cefa37da07e