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

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

Change-Id: I49f537f11f0e00b058274365622b844f55223fd0