Merge "Improve snapshot clearing consistency" into sc-dev am: 2b9301d0 am: e4f1c296 am: d4f46724

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

Change-Id: Idbb9803e3e141e480090b1040de578c46371a491