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: 1945aedc am: 53f70e14" into tm-qpr-dev-plus-aosp am: 3566eaf0

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



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