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

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

Change-Id: Id1a79215b751f9ec64008932318ac7d046632c4e