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

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

Change-Id: I3f279e2e06d3f6b1177c62d49dc77da8b79d1ec3