[automerger skipped] Merge "Workaround for crash from invalid snapshot" into...

[automerger skipped] Merge "Workaround for crash from invalid snapshot" into rvc-dev am: 10250f67 am: 2a28c024 am: d67afc31 am: db28cd3b -s ours

am skip reason: Change-Id I48be367d8aafb3e17f11a73a73432617a247c0dd with SHA-1 428c17f4 is in history

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

Change-Id: Ib023d0beddff21a8afaab6ea0546a0475eee7fa9