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: Ie233dd9f6628ac6780dd0b96d8eca97d7892b929