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: Iafaadf2f8338b5bc52de8323787ce1c6926ad92d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>