Merge "Add contrast level in settings" into tm-qpr-dev am: 7955fa37 am: 93ae788a

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



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