Merge "Compile android-non-updatable separately" am: e4d95a9e15 am: c26f163ad3

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

Change-Id: Iebca1291888f3f04f779d3abe4aaf049cde7856e