Merge "Add SDK version check to skip S added API test" am: 739195c5b0

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

Change-Id: I40516d56f9ca477d62c362dbdf11aad713c620ae