Merge "Release the child layer on TaskSnapshot" into sc-v2-dev am: 10b3662274

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

Change-Id: Iec7c2958149daa50ad1f2d6f161ece7a850c4a4b