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

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