Merge "fix(high contrast text) : Make simplified paint have SRC_OVER blend...

Merge "fix(high contrast text) : Make simplified paint have SRC_OVER blend mode." into main am: febfdcc1 am: bf6aadae

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



Change-Id: I478b44ccc2c26099455f6bcbb715b69f5a7fb30f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>