[automerger skipped] Merge "Back up the smooth display setting" into udc-dev am: 85d5e3efb8
-s ours am: 1fc920d0cf
-s ours
am skip reason: Merged-In Ib2cb2dd100f06f5452083b7606109a486e795a0e with SHA-1 af320436fb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21957485
Change-Id: Ia247228af654d1f73e77d6c85d772c94683213ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: