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

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

Change-Id: If53bf36cdbebf588303b24f1965d024e4c0f1c93