Merge "Improve ImageManager error message" am: 5ca85a05e3

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

Change-Id: I5ea2586e32af118978446a42a5d801ca763a419a