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: I2a42a67681613992474c86cbf2e7744a67bf7a08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>