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

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

Change-Id: I22e9c4ec194af154c5743f117d73ad70ea8d2099