[automerger skipped] Merge "Re-submit "Add genrule for combined srcjar of modules"" am: 181885c8 am: 15753f03 am: 46793d1a am: b760711d -s ours

am skip reason: Change-Id I851ff8e87476b8e22abdcfe1d75da5d82030f302 with SHA-1 89c74dc4 is in history

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

Change-Id: Iaf5add8482bd3fb2cd9a84a015a3d4cf5cda024a