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

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

Change-Id: Ib885dc5d739648ede0de95077504a470f7bb972d