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

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

Change-Id: I60df429605c78749c0259f7efffab026210a4977