Merge "android.media.cts: Do not test S APIs in pre S targets" into sc-dev