Merge "Fix cts test failure of EnsureBarContrastTest" am: 528a63d7e9 am: 02896e98da

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1930821

Change-Id: Iba13295d9d2b4609620eae5dca8ab86562ce5f6d