Merge "Dist android-non-updatable.jar for sdk" am: e93771bfca am: 9ed545c4e7

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

Change-Id: Iff0921640fe770fc2c58c29675d5ae50395415a7