Merge "Fixed contrast with sfps overlay." into tm-qpr-dev am: d5822ed0 am: 5a2fdecf

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



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