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

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

Change-Id: Ibd97e2110a0c4b168f8b86cf675c6648b2f3abd4