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

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

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



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