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

[automerger skipped] Revert "Back up the smooth display setting" am: 44774823 -s ours am: 66af35d9 -s ours

am skip reason: Merged-In Ia887bd2ad00900eaad5f8fb34ed73ffcdf9f783a with SHA-1 58e75fc4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22904199



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