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

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

Change-Id: Iec4b14d29945ae3088838428cc48b36ae71faeb2