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

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

Change-Id: If5a19712bdceb5cc60eea4ba6cccdd830114cd4c