Merge "Make an error message more informative" am: b333a400

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2370568



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