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

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



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