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

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

Change-Id: I057a0d7c6a8697e301f6aa1b37088140d0cc8bb6