Merge "Fix long screenshot text contrast in dark mode." into sc-dev am:...

Merge "Fix long screenshot text contrast in dark mode." into sc-dev am: 113886cc am: 00d0301b am: cef449d7

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

Change-Id: If93a2e6b1ccb07f1f82b8c3474d5768818ccdeed