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

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

Change-Id: I159a4d26d9386d7e9fa1471297132c78245afce8