[automerger skipped] Back up the smooth display setting am: 492e36aa -s ours...

[automerger skipped] Back up the smooth display setting am: 492e36aa -s ours am: d053c8af -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: Ie76d605a423ca634f41404a27c290aa4bade88c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>