Merge "Merge "Revert "Back up the smooth display setting"" into udc-d1-dev am:...

Merge "Merge "Revert "Back up the smooth display setting"" into udc-d1-dev am: 561e58b0" into udc-d1-dev-plus-aosp am: 46de212e

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



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