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

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

Change-Id: I932791809f4ad15e3dbadd843a66aef0c655fe0d