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