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

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

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