Merge "Fix strictmode error logs due to task snapshot hw buffer not being...

Merge "Fix strictmode error logs due to task snapshot hw buffer not being closed" into sc-dev am: 40902ab9 am: e2229dc0 am: a1b68a60

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

Change-Id: Ib0a21a9885ac3a7a769bb6241d01e8589d8dce97