Merge "Add genrule for combined srcjar of modules" am: 1452dc60ca am: 730982b142

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

Change-Id: I3d14ff9d91ca800467076916ba3b49446f97e4de