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

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

Change-Id: I268f89bb49ecb6d108d4bb32185650d52340c052