[automerger skipped] Revert "Back up the smooth display setting" am:...

[automerger skipped] Revert "Back up the smooth display setting" am: eef23f44 -s ours am: 2471b9f5 -s ours

am skip reason: Merged-In I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b with SHA-1 139bc341 is already in history

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



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