Merge "Enable color threshold editing via SystemProperties" into tm-qpr-dev...

Merge "Enable color threshold editing via SystemProperties" into tm-qpr-dev am: 79b8b967 am: 1dc20eb0

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



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