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

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

Change-Id: If011ab8cb20dbb286eecc49ce85688fd8261fa83