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

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

Change-Id: Id55afc826b3d874f125922dc651e3dde652b8ad8