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

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

Change-Id: I0cdc2e50246204925590ba556b6b67a7499140ee