Merge "Add genrules for merged current.txt" am: 591327acd4 am: e21772ed50 am: 5d0b80fb10 am: 00377e4d90

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

Change-Id: I000e2a945e54e268a64df4a156afb85e6ea6676f