Merge "Fix error message being cut off." am: 6a62b29a am: 1e14d9bf

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



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