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

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

Change-Id: I0aa854b37deaeb42c36ea789015ca7fedc3cf415