Merge "Have more meaningful error message" into udc-dev am: d2f56c14

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21489568



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