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

Merge "Merge "Clear snapshot buffer preemptively if unused" into tm-dev am: 87b7e43b am: 4fd95f1b am: 36300d94" into tm-qpr-dev-plus-aosp am: 12b04bf4

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



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