Merge "Re-submit "Make sdk depend on merged srcjar instead of monolith"" am: 2686ccd91a

Original change: https://android-review.googlesource.com/c/platform/development/+/1492878

Change-Id: Ib6046355cf4639b432c5149eeb220f0b792afeac