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

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

Change-Id: I93de42fc706d521307b7cf08ac328b182131a542