Merge "Fix initialization of snapshot SkImage instance" into sc-qpr1-dev am: be0bdf6178 am: 201db897ea am: fd2133a687

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

Change-Id: Ideb312c495cf0045a237e1e6caf53d2fca11dea0