[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: 2a28c024 am: 8def3186" into rvc-qpr-dev-plus-aosp am: cd1665a8 -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: I131f4a3279b7846f5b10266b389921b4ae515af7