Merge "Merge "Fix: Release skia resources when RenderNode layer is configured"...

Merge "Merge "Fix: Release skia resources when RenderNode layer is configured" into sc-dev am: 43038ca7 am: 544b9f73" into sc-v2-dev-plus-aosp am: 8d749ba2

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

Change-Id: I01232b691a9c547c81832cfe66b288886941a20a