Merge "Re-submit "Add genrules for merged removed.txt files"" am: c2ee800f20 am: 41d0224165

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

Change-Id: Ied03efe8ac290a7dfb917c91e70cc664dfecaee9