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

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

Change-Id: I7b3fdb3769e79cc96c10b994fe090726c8ee8296