Merge "Null check if renderer is null" into sc-v2-dev am: 31281969e6 am: 2ab816868f

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

Change-Id: I8dc0b0866be09cae5c0229af78996b60725867d0