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

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

Change-Id: I4e1cde89cc83a6cf4e06131691aea0aaa54dae82