Merge "Remove unused monolithic jars" am: fd4bcbd76a am: dd64b2cbf9

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

Change-Id: Ie9cd9660339517ce17cf4c2279781bd04ddaaadf