[automerger skipped] Merge "Fix cts test failure of EnsureBarContrastTest" am:...

[automerger skipped] Merge "Fix cts test failure of EnsureBarContrastTest" am: 528a63d7 am: 02896e98 am: 7f326c9d am: 3dfc3ca7 -s ours

am skip reason: Merged-In If123f4d56758078def8a7c50c218d75e0217633b with SHA-1 54670769 is already in history

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

Change-Id: Iba07232439f75b392d7693052d9f6887829c84f3