Merge "Migrate away from using @suppress" into androidx-main