Merge "Mark S APIs with @RequiresAPI annotation" into sc-mainline-prod