Merge "Color correction string update" into sc-dev am: d85600e7 am: 0d80990e

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

Change-Id: I4797152b0a8980bc023e7b477b48a67bfd7d75d5