Merge "Remove framework-private Color.HSBtoColor API"