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

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

Change-Id: I6c2a2d1a2b76d04720ead9f2c78075e2ddf8c65f