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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idc7f60cc595360a86f662f099b2d8a55ee0f39a5