Merge "Add genrules for merged removed.txt files" am: 19189d886b am: 554cdd7792

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

Change-Id: I472ffc39686ef7b895509140ff13a917ec882556