Merge "Improve snapshot clearing consistency" into sc-dev am: 2b9301d0 am: bf2faa47 am: 6febdd1f

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

Change-Id: Ia0232339f64c789fba85ab2a29513388b95b5a7f