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

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

Change-Id: Ifc487bbe6280beb35b16fb323b0e1cb6a246b314