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

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

Change-Id: Iabd9e3ac438fcc52a257d3d94a3c87ca17ca87e1