Merge "Fix erroneous self deletion on SkImage creation failure" am: e5aac985ab

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

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