[automerger skipped] Merge "Fix erroneous self deletion on SkImage creation...

[automerger skipped] Merge "Fix erroneous self deletion on SkImage creation failure" am: e5aac985 am: f86aa37f am: 2b9dbe9d -s ours

am skip reason: Merged-In I7fd2566b9a85fe286f72b0fc42eba5450cac69b0 with SHA-1 2163e410 is already in history

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



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