[automerger skipped] Merge "Add genrule for combined srcjar of modules" am:...

[automerger skipped] Merge "Add genrule for combined srcjar of modules" am: 1452dc60 am: 730982b1 am: c36ad823 am: 6af2ef3c -s ours

am skip reason: Change-Id Idfc94cdb3317d3bde0b29fd8da0a9ccef47377f9 with SHA-1 5d0687a2 is in history

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

Change-Id: I34b14a8357cccf54abbe54bc5e570f606940220b