Merge "Smooth Display description error" into udc-dev am: 24a5a1c8 am: 947f9f25

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22693748



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