[automerger skipped] Merge "Fix bug on High Contrast Text : where DarkTheme is enabled && ForceDarkAllowed is true." am: ed088713 am: 05745064 am: c21c4135 -s ours

am skip reason: Change-Id Icf0048ef8d55c2e29676944c24c2050f531616d5 with SHA-1 0c15baeb is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifff414f6fffd3aff8813211fe69e9be720f225d6