Merge "Compose the main stubs jars from module stubs" am: bb7674fad3

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

Change-Id: I5ec1b6f3f09fee1c0a771aac101a173a0c2ded86