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: Ibac90a5800af1c9edec519a2a0291fcead8843e5