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

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

Change-Id: I2548dbfdc44faea3da2bc07290ee28fba9882d6f