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

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

Change-Id: I597f9b8028c2af4d1e09a5e0d7db237e80fa3ca3