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

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

Change-Id: I9da4af4172ed8c13582c27e0e4394cbd3caa0d72