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

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

Change-Id: Ib32b8ec1ad7c55ddfdba965e8d8426a85d98b3de