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

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

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



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