Merge "Add support for @EnabledSince compat changes" am: 2d57867aba

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455019

Change-Id: I600c63a996b1684a2b801787d88974501062c073