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

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

Change-Id: I99c9e633a872715c3136f2c9293ca1b1ac06bdbe