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

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



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