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

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



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