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

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

Change-Id: I473766aad5e8daf84d454dcd992617766b08e474