Merge "Clear snapshot buffer preemptively if unused" into tm-dev am: 87b7e43b am: 1945aedc

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



Change-Id: Ie612f7c7cb5be29eee6128158b5a86f3182ed3c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>