[automerger skipped] Merge "Revert "Back up the smooth display setting"" into...

[automerger skipped] Merge "Revert "Back up the smooth display setting"" into udc-dev am: 060a5646 am: 7c369b3d -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: I50486bc710b63e92ec88b4342ec676e3ffd2e9b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>