Merge "Add contrast setting in dev options" into udc-dev am: 222a89ac

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425568



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