Merge "Revert "Add genrules for merged removed.txt files"" am: 27b40fc234 am: de51075d79 am: 1691d6d02a

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

Change-Id: I6109a937e1efa42094309e54a24e9851dacb92f6