Merge "Add genrule for combined srcjar of modules" am: 1452dc60ca am: 730982b142 am: c36ad8233e

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

Change-Id: I0d543aa3ed7c65fd388c6e4ba62092fb7b8e7792