Merge "Re-submit "Add genrule for combined srcjar of modules"" am: 181885c868 am: 15753f03cc am: 46793d1aae

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

Change-Id: I12a919c3ab71fe40682bd366628c61afdaf09b33