Merge "Add enabledSince support for compat changes" am: c90a797b8e am: 33edcd4dbc am: bcf00b61dd

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

Change-Id: Ia5d2e78398f907f45d0904927974a403f8476b22