Merge "Dist merged jar instead of monolithic one" am: 7350b62384

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

Change-Id: Ib1f8c1d50a31021559bdee04115182a4d17f7006