Merge "Workaround for crash from invalid snapshot" into rvc-dev am: 10250f67f1

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

Change-Id: I752ac36e9330e8cbe35db1c6f17a63edf410d4b6