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

Merge "Re-submit "Add genrules for merged removed.txt files"" am: c2ee800f am: 41d02241 am: c3edde59

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

Change-Id: I44126e7fbfb166eb4d0247a7495c8d373011ec57