Merge "Revert "Back up the smooth display setting"" into udc-dev am: 0801b7be

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



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