Merge "Fix the return type of ADisplayLutsEntry_getDimension and ADisplayLutsEntry_getSamplingKey." into main