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

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

Change-Id: Id35b4219ec4e944c80105e6008c12210036d40a7