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

[automerger skipped] Merge "Merge "Workaround for crash from invalid snapshot" into rvc-dev am: 10250f67 am: 67fd0fd1" into rvc-d1-dev-plus-aosp am: efe9fb03 -s ours am: f28fb11e -s ours

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

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

Change-Id: Ib6ae70b878335dcc045dcc96e44e31de81ef34b2