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

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

Change-Id: I7b36622e3355c1c8eb365813579958b8260c8c17