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

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

Change-Id: I1efc39fb23aeaaa788ed7fbb559b871bb3a1b283