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

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

Change-Id: I827128e94162864ac40c1bdff2ec9979e9b12d6a