Merge "Revert "Add discrete contrast UI slider in the setting"" into udc-dev am: f9f6b80e

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



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