Merge "Fix aggressive caching of RenderNode snapshot" into sc-qpr1-dev am: baa35d0ab9 am: 9ad4e5698e

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

Change-Id: I7dfe7db2e620828a1e9ae94f86cd5788a1d3ae37