Merge "Fix bug on High Contrast Text : where DarkTheme is enabled &&...

Merge "Fix bug on High Contrast Text : where DarkTheme is enabled && ForceDarkAllowed is true." into sc-dev am: d7eae488 am: 1047f538

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

Change-Id: I38711436fc785b38d7ca55792fac1b663cd81223