Merge "Add SDK version check to skip S added API test" am: 045961b828 am: 97247ff9a3

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

Change-Id: I057a0d7c6a8697e301f6aa1b37088140d0cc8bb6
tree: 4ce0b9d63fca983d04b36b7504aded9e88968500
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING