Merge "Migrate CTS_SYSTEM_API_CHANGEID to @EnabledSince" am: 9aed0ced55 am: 1e91aa6b78 am: daad5e0aa3 am: 9a8dde9618

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

Change-Id: Ia3988eca36156082daef38b79093e1ff1dcc6f0b