Merge "Make sure we check for valid GrContext when pinning images." into...

Merge "Make sure we check for valid GrContext when pinning images." into sc-dev am: 351080a8 am: f138e002

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

Change-Id: I619d012f410f1484c9028c2a46389bba08fe6337