[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: 0801b7be -s ours am: c271d93c -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: I14163a865e8a2b9e30bb4934e54c7b9ea55a7a29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>