Merge "Update bad calibration error message" into udc-dev am: 1df5ad89

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



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