Merge "Revert "Back up the smooth display setting"" into udc-dev am: 060a5646

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



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