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

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

Change-Id: I2893715442a5589bd9573d1da5d1376813fc3255