Merge "Add genrule for combined-removed-dex" am: b0ba7618c8 am: dd7eb2b019 am: a07b8d4e93

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

Change-Id: I0840de9ac273a0d4f8ea006dd7a1ae9b8ffe5ae1