Merge "Update lint baseline suppression for API 31." into sc-dev