Merge "Remove framework-private HSV APIs, replace with luminance"