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 am: 18cf87b9 am: a5885916

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

Change-Id: I6c2a2d1a2b76d04720ead9f2c78075e2ddf8c65f