Merge "Fix bug on High Contrast Text : where DarkTheme is enabled && ForceDarkAllowed is true." am: ed08871382 am: 057450645c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic3d973e373cc78219add7b4bc0b908ce9e8d680f