Merge "Fix disting of android_system.jar" am: 0206a453f1 am: fad6403b9f am: 5294410614 am: 08290119fb

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

Change-Id: I5e0f69aa407d52dc41f163c9d3671baf6e21153b