Merge "Revert "Use VERSION_CODES.S instead of VERSION_CODES.R + 1""