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

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

Change-Id: I601044300fbea039823b2bfad37d59cc4fec6ed5