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

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

Change-Id: Ic6c705b3f8fee928502e2788b027784ce46687e7