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

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



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