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

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

Change-Id: I619111352f5510e69b6074ffcf11b8234fa3cc87