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

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

Change-Id: I636de254b4d7dd9c8f7ffe4cb55a12ada1fcf53b