Merge "Move non-updatable-api/ to core/api/" am: ad2bb796b0 am: d6987e84d5

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

Change-Id: I9aafe5b87236abfbe019f6297dcb31a7cc900957