Merge "[automerger skipped] Merge "Compose the main stubs jars from module...

Merge "[automerger skipped] Merge "Compose the main stubs jars from module stubs" into rvc-dev am: d8d0efef -s ours am: e88fb838 -s ours am: 9155032c -s ours" into rvc-qpr-dev-plus-aosp am: cb992496 -s ours

am skip reason: Change-Id I255486112c03f237aa342cfb93f3b473a2f50470 with SHA-1 4f8e7497 is in history

Change-Id: I608668fdd940f12ce470da66508f174f81a59a99