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

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

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