Merge "Fix cts test failure of EnsureBarContrastTest"