[automerger skipped] Merge "Back up the smooth display setting" into udc-dev am: 85d5e3ef -s ours

am skip reason: Merged-In Ib2cb2dd100f06f5452083b7606109a486e795a0e with SHA-1 af320436 is already in history

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



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