[automerger skipped] Merge "Revert "Back up the smooth display setting"" into udc-dev am: 060a56468d
-s ours am: 028c16242d
-s ours
am skip reason: Merged-In I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b with SHA-1 139bc341f3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894948
Change-Id: I7a82893233c15bfefb534b67c56a46372f5b1d31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: