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

[automerger skipped] Merge "Compose the main stubs jars from module stubs" am: bb7674fa am: 0c90961d -s ours am: 8af7727a -s ours am: b7b9f4af -s ours am: 9d8cf2af -s ours

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

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

Change-Id: I1e73f5fb54b7f277a57ca0cbe397780e7a83626e