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

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

Change-Id: I642a60c1ad265c645ea441ee0393e732622b3288